MyHyvesBookPlus/WebDB
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Merge branch 'lars' into 'master'

Browse Source 
Lars

See merge request !206
This commit was merged in pull request #210.
This commit is contained in:
Lars van Hijfte
2017-02-03 11:21:12 +01:00
parent 306fd3090f 4eae09dfc7
commit 16f83d93ce
5 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
website/public/group.php
View File

@@ -13,7 +13,7 @@
include_once("../queries/group_page.php"); 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("HTTP/1.0 404 Not Found");
header("Location: error/404.php"); header("Location: error/404.php");
die(); die();

1
website/public/js/chat.js
View File

@@ -51,6 +51,7 @@ function sendMessage() {
}); });
$("#newContent").val(""); $("#newContent").val("");
$("#newContent").focus();
} }
// Add messages to the chat. // Add messages to the chat.

3
website/public/profile.php
View File

@@ -25,7 +25,8 @@ if(empty($_GET["username"])) {
$userID = getUserID($_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("HTTP/1.0 404 Not Found");
header("Location: error/404.php"); header("Location: error/404.php");
die(); die();

9
website/public/styles/adminpanel.css
View File

@@ -1,13 +1,15 @@
.admin-panel {
min-width: 800px;
}
.admin-panel input[type="radio"], input[type="checkbox"] { .admin-panel input[type="radio"], input[type="checkbox"] {
vertical-align: middle; vertical-align: middle;
height: 28px; height: 28px;
width: 28px;
margin: 2px; margin: 2px;
} }
.table-checkbox {
width: 28px;
}
.admin-searchform { .admin-searchform {
display: inline-block; display: inline-block;
width: 100%; width: 100%;
@@ -42,6 +44,7 @@
.usertable th, td { .usertable th, td {
border-bottom: 1px solid #ddd; border-bottom: 1px solid #ddd;
padding: 3px; padding: 3px;
word-wrap: break-word;
} }
.usertable th, tr { .usertable th, tr {

2
website/views/adminpanel-table.php
View File

@@ -1,5 +1,5 @@
<tr> <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-username">Gebruikersnaam</th>
<th class="table-status">Status</th> <th class="table-status">Status</th>
<th class="table-comment">Aantekening</th> <th class="table-comment">Aantekening</th>