From c29be662bcb473a178091f298dee2fe4e1cf8e54 Mon Sep 17 00:00:00 2001 From: Lars van Hijfte Date: Fri, 3 Feb 2017 11:18:17 +0100 Subject: [PATCH 1/2] Session logout now works --- website/public/group.php | 2 +- website/public/profile.php | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/website/public/group.php b/website/public/group.php index 84726fa..11a2609 100644 --- a/website/public/group.php +++ b/website/public/group.php @@ -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(); diff --git a/website/public/profile.php b/website/public/profile.php index 126c87f..899c9bd 100644 --- a/website/public/profile.php +++ b/website/public/profile.php @@ -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(); From 53e1d7fef3dc1e95fa684d5ae023861687e9e369 Mon Sep 17 00:00:00 2001 From: Lars van Hijfte Date: Fri, 3 Feb 2017 11:18:32 +0100 Subject: [PATCH 2/2] Fixed admin layout --- website/public/js/chat.js | 1 + website/public/styles/adminpanel.css | 9 ++++++--- website/views/adminpanel-table.php | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/website/public/js/chat.js b/website/public/js/chat.js index f431b91..06dffa4 100644 --- a/website/public/js/chat.js +++ b/website/public/js/chat.js @@ -51,6 +51,7 @@ function sendMessage() { }); $("#newContent").val(""); + $("#newContent").focus(); } // Add messages to the chat. diff --git a/website/public/styles/adminpanel.css b/website/public/styles/adminpanel.css index 39d823f..3e97ace 100644 --- a/website/public/styles/adminpanel.css +++ b/website/public/styles/adminpanel.css @@ -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%; @@ -41,6 +43,7 @@ .usertable th, td { border-bottom: 1px solid #ddd; padding: 3px; + word-wrap: break-word; } .usertable th, tr { diff --git a/website/views/adminpanel-table.php b/website/views/adminpanel-table.php index f7bc966..013a907 100644 --- a/website/views/adminpanel-table.php +++ b/website/views/adminpanel-table.php @@ -1,5 +1,5 @@ - + Gebruikersnaam Status Aantekening