Merge branch 'lars' into 'master'
Lars See merge request !206
This commit was merged in pull request #210.
This commit is contained in:
@@ -13,7 +13,7 @@
|
||||
|
||||
include_once("../queries/group_page.php");
|
||||
|
||||
if(!$group = selectGroupByName($_GET["groupname"])) {
|
||||
if(isset($_SESSION["userID"]) and !$group = selectGroupByName($_GET["groupname"])) {
|
||||
header("HTTP/1.0 404 Not Found");
|
||||
header("Location: error/404.php");
|
||||
die();
|
||||
|
||||
@@ -51,6 +51,7 @@ function sendMessage() {
|
||||
});
|
||||
|
||||
$("#newContent").val("");
|
||||
$("#newContent").focus();
|
||||
}
|
||||
|
||||
// Add messages to the chat.
|
||||
|
||||
@@ -25,7 +25,8 @@ if(empty($_GET["username"])) {
|
||||
$userID = getUserID($_GET["username"]);
|
||||
}
|
||||
|
||||
if(!$user = selectUser($_SESSION["userID"], $userID)) {
|
||||
|
||||
if (isset($_SESSION["userID"]) and !$user = selectUser($_SESSION["userID"], $userID)) {
|
||||
header("HTTP/1.0 404 Not Found");
|
||||
header("Location: error/404.php");
|
||||
die();
|
||||
|
||||
@@ -1,13 +1,15 @@
|
||||
.admin-panel {
|
||||
min-width: 800px;
|
||||
}
|
||||
|
||||
.admin-panel input[type="radio"], input[type="checkbox"] {
|
||||
vertical-align: middle;
|
||||
height: 28px;
|
||||
width: 28px;
|
||||
margin: 2px;
|
||||
}
|
||||
|
||||
.table-checkbox {
|
||||
width: 28px;
|
||||
}
|
||||
|
||||
.admin-searchform {
|
||||
display: inline-block;
|
||||
width: 100%;
|
||||
@@ -42,6 +44,7 @@
|
||||
.usertable th, td {
|
||||
border-bottom: 1px solid #ddd;
|
||||
padding: 3px;
|
||||
word-wrap: break-word;
|
||||
}
|
||||
|
||||
.usertable th, tr {
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<tr>
|
||||
<th><input class="table-checkbox" type="checkbox" id="checkall" name="checkall" onchange="checkAll()"></th>
|
||||
<th class="table-checkbox"><input class="table-checkbox" type="checkbox" id="checkall" name="checkall" onchange="checkAll()"></th>
|
||||
<th class="table-username">Gebruikersnaam</th>
|
||||
<th class="table-status">Status</th>
|
||||
<th class="table-comment">Aantekening</th>
|
||||
|
||||
Reference in New Issue
Block a user