From cfe2928f7b277b5224700fac2086903c6f4556c6 Mon Sep 17 00:00:00 2001 From: "K. Nobel" Date: Wed, 1 Feb 2017 14:28:03 +0100 Subject: [PATCH 01/37] Fixed member list --- website/public/group.php | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/website/public/group.php b/website/public/group.php index 72da9c8..bb393e3 100644 --- a/website/public/group.php +++ b/website/public/group.php @@ -14,12 +14,7 @@ include_once("../queries/group_page.php"); $group = selectGroupByName($_GET["groupname"]); -$members = selectGroupMembers(2); - -?> - - - Date: Wed, 1 Feb 2017 14:31:18 +0100 Subject: [PATCH 02/37] Added noposts div to group. --- website/views/group.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/website/views/group.php b/website/views/group.php index c12b552..aaec353 100644 --- a/website/views/group.php +++ b/website/views/group.php @@ -22,6 +22,10 @@ +
+

Geen posts meer!

+
+
From 0546b8689df056533e0c8623155139e62ea6a662 Mon Sep 17 00:00:00 2001 From: Lars van Hijfte Date: Wed, 1 Feb 2017 14:51:27 +0100 Subject: [PATCH 03/37] BUG FIX: name size --- website/public/styles/main.css | 14 -------------- website/public/styles/profile.css | 3 +-- website/queries/friendship.php | 17 +++++++++-------- website/queries/private_message.php | 2 +- website/queries/user.php | 4 ++-- website/views/group.php | 19 ++++++++++++------- website/views/settings-view.php | 11 +++++++++-- 7 files changed, 34 insertions(+), 36 deletions(-) diff --git a/website/public/styles/main.css b/website/public/styles/main.css index 94fdea9..226a96d 100644 --- a/website/public/styles/main.css +++ b/website/public/styles/main.css @@ -102,7 +102,6 @@ p { .group-picture { border-radius: 5px; - border: none; } .item-box, .item-box-full-width { @@ -291,19 +290,6 @@ div[data-title]:hover:after { vertical-align: middle; } -::-webkit-scrollbar { - width: 5px; - height: 5px; -} -::-webkit-scrollbar-track { - background: none; -} -::-webkit-scrollbar-thumb { - -webkit-border-radius: 20px; - border-radius: 20px; - background: #4CAF50; -} - @media only screen and (max-width: 1080px) { body { font-size: 28px!important; diff --git a/website/public/styles/profile.css b/website/public/styles/profile.css index 1bacafa..0d792ac 100644 --- a/website/public/styles/profile.css +++ b/website/public/styles/profile.css @@ -11,7 +11,7 @@ display: inline-block; } -.friend-button-container { +.friend-button-container, .group-button-container { position: relative; float: right; width: 200px; @@ -62,7 +62,6 @@ .group-picture { border: none; - margin-bottom: 0; margin-right: 15px; } diff --git a/website/queries/friendship.php b/website/queries/friendship.php index a16d859..7355af2 100644 --- a/website/queries/friendship.php +++ b/website/queries/friendship.php @@ -10,8 +10,8 @@ function selectLimitedFriends($userID, $limit) { $stmt = prepareQuery(" SELECT `userID`, - `username`, - LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 15) as `fullname`, + LEFT(`username`, 17) as `username`, + LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 12) as `fullname`, IFNULL( `profilepicture`, '../img/avatar-standard.png' @@ -50,8 +50,8 @@ function selectAllFriends($userID) { $stmt = prepareQuery(" SELECT `userID`, - `username`, - LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 15) as `fullname`, + LEFT(`username`, 17) as `username`, + LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 12) as `fullname`, IFNULL( `profilepicture`, '../img/avatar-standard.png' @@ -85,8 +85,8 @@ function selectAllFriendRequests() { $stmt = prepareQuery(" SELECT `userID`, - `username`, - LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 15) as `fullname`, + LEFT(`username`, 17) as `username`, + LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 12) as `fullname`, IFNULL( `profilepicture`, '../img/avatar-standard.png' @@ -235,8 +235,9 @@ function searchSomeFriends($n, $m, $search) { $stmt = prepareQuery(" SELECT `userID`, - `username`, - LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 15) as `fullname`, + + LEFT(`username`, 17) as `username`, + LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 12) as `fullname`, IFNULL( `profilepicture`, '../img/avatar-standard.png' diff --git a/website/queries/private_message.php b/website/queries/private_message.php index 4ac04a7..3b88563 100644 --- a/website/queries/private_message.php +++ b/website/queries/private_message.php @@ -95,7 +95,7 @@ function getNewChatMessages($lastID, $destination) { function selectAllUnreadChat() { $stmt = prepareQuery(" SELECT - LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 15) AS `fullname`, + LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 12) as `fullname`, `user`.`userID`, IFNULL( `profilepicture`, diff --git a/website/queries/user.php b/website/queries/user.php index 33a85a1..101c70c 100644 --- a/website/queries/user.php +++ b/website/queries/user.php @@ -345,12 +345,12 @@ function searchSomeUsers($n, $m, $search) { $stmt = prepareQuery(" SELECT `userID`, - `username`, + LEFT(`username`, 17) as `username`, IFNULL( `profilepicture`, '../img/avatar-standard.png' ) AS profilepicture, - LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 15) as `fullname`, + LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 12) as `fullname`, CASE `lastactivity` >= DATE_SUB(NOW(),INTERVAL 15 MINUTE) WHEN TRUE THEN 'online' WHEN FALSE THEN 'offline' diff --git a/website/views/group.php b/website/views/group.php index c12b552..d192123 100644 --- a/website/views/group.php +++ b/website/views/group.php @@ -1,12 +1,17 @@
-
- -
-

-

- +
+ ">
+
+
+ +
+
+
+

+ +
+
-

Leden ()

diff --git a/website/views/settings-view.php b/website/views/settings-view.php index e3cfd36..4a54ec5 100644 --- a/website/views/settings-view.php +++ b/website/views/settings-view.php @@ -17,6 +17,7 @@ $settings = getSettings(); " @@ -27,6 +28,7 @@ $settings = getSettings(); " > @@ -36,6 +38,7 @@ $settings = getSettings(); " > @@ -186,6 +189,7 @@ $settings = getSettings(); " disabled > @@ -194,6 +198,7 @@ $settings = getSettings(); @@ -203,14 +208,16 @@ $settings = getSettings();

  • + value="email"> + Verander Email +
    • From d027333bd7dfa3170505566a0f93c6b5ef55d6d9 Mon Sep 17 00:00:00 2001 From: Hendrik Date: Thu, 2 Feb 2017 01:06:31 +0100 Subject: [PATCH 04/37] fix filter and pagenumber interaction in search --- website/public/API/searchPageNumber.php | 14 ++++++++--- website/queries/friendship.php | 31 +++++++++++++++++++++++++ website/queries/group_member.php | 23 ++++++++++++++++++ website/views/search-view.php | 7 +++++- 4 files changed, 71 insertions(+), 4 deletions(-) diff --git a/website/public/API/searchPageNumber.php b/website/public/API/searchPageNumber.php index 4a76516..9a12d79 100644 --- a/website/public/API/searchPageNumber.php +++ b/website/public/API/searchPageNumber.php @@ -6,6 +6,8 @@ require_once ("../../queries/connect.php"); require_once ("../../queries/checkInput.php"); require_once ("../../queries/user.php"); require_once ("../../queries/group_page.php"); +require_once ("../../queries/friendship.php"); +require_once ("../../queries/group_member.php"); $user_perpage = $group_perpage = 20; @@ -25,14 +27,20 @@ if (isset($_POST['search'])) { $search = test_input($_POST['search']); } -$user_count = countSomeUsers($search)->fetchColumn(); -$group_count = countSomeGroups($search)->fetchColumn(); - $filter = "all"; if (isset($_POST['filter'])) { $filter = test_input($_POST['filter']); } +if ($filter == "all") { + $user_count = countSomeUsers($search)->fetchColumn(); + $group_count = countSomeGroups($search)->fetchColumn(); +} else { + $user_count = countSomeFriends($search); + $group_count = countSomeOwnGroups($search); +} + + $option = "user"; if (isset($_POST['option'])) { $option = test_input($_POST['option']); diff --git a/website/queries/friendship.php b/website/queries/friendship.php index 450fd20..49d8047 100644 --- a/website/queries/friendship.php +++ b/website/queries/friendship.php @@ -274,4 +274,35 @@ function searchSomeFriends($n, $m, $search) { $stmt->bindParam(':m', $m, PDO::PARAM_INT); $stmt->execute(); return json_encode($stmt->fetchAll()); +} + +function countSomeFriends($search) { + $stmt = prepareQuery(" + SELECT + COUNT(*) + FROM + `user` + INNER JOIN + `friendship` + WHERE + ((`friendship`.`user1ID` = :userID AND + `friendship`.`user2ID` = `user`.`userID` OR + `friendship`.`user2ID` = :userID AND + `friendship`.`user1ID` = `user`.`userID`) AND + `user`.`role` != 'banned' AND + `friendship`.`status` = 'confirmed') AND + (`username` LIKE :keyword OR + `fname` LIKE :keyword OR + `lname` LIKE :keyword) + ORDER BY + `fname`, + `lname`, + `username` + "); + + $search = "%$search%"; + $stmt->bindParam(':keyword', $search); + $stmt->bindParam(':userID', $_SESSION["userID"], PDO::PARAM_INT); + $stmt->execute(); + return $stmt->fetchColumn(); } \ No newline at end of file diff --git a/website/queries/group_member.php b/website/queries/group_member.php index cea4dde..8b6bf75 100644 --- a/website/queries/group_member.php +++ b/website/queries/group_member.php @@ -54,3 +54,26 @@ function searchSomeOwnGroups($n, $m, $search) { return json_encode($stmt->fetchAll()); } + +function countSomeOwnGroups($search) { + $stmt = prepareQuery(" + SELECT + COUNT(*) + FROM + `group_page` + INNER JOIN + `group_member` + WHERE + `group_member`.`userID` = :userID AND + `group_member`.`groupID` = `group_page`.`groupID` AND + `group_page`.`status` != 'hidden' AND + `name` LIKE :keyword + "); + + $search = "%$search%"; + $stmt->bindParam(':keyword', $search); + $stmt->bindParam(':userID', $_SESSION["userID"], PDO::PARAM_INT); + $stmt->execute(); + + return $stmt->fetchColumn(); +} \ No newline at end of file diff --git a/website/views/search-view.php b/website/views/search-view.php index e42f985..f00fd3c 100644 --- a/website/views/search-view.php +++ b/website/views/search-view.php @@ -48,7 +48,12 @@ $group_n = ($group_currentpage - 1) * $group_perpage; - From 60b55b3f04437ad42344561dfb799f08d729ee6a Mon Sep 17 00:00:00 2001 From: Lars van Hijfte Date: Thu, 2 Feb 2017 10:29:49 +0100 Subject: [PATCH 05/37] Added comments Also hiding the mail/age if said so by the user --- website/public/API/loadChatNotifications.php | 1 + website/public/API/loadFriendRequest.php | 1 + website/public/API/loadFriends.php | 2 + website/public/API/loadGroups.php | 2 + website/public/API/loadMessages.php | 2 + website/public/API/sendMessage.php | 3 ++ website/public/bits/friend-item.php | 4 ++ website/public/bits/group-item.php | 1 + website/public/js/chat.js | 41 +++++++++++++++----- website/public/js/main.js | 8 ++++ website/public/js/search.js | 3 ++ website/queries/friendship.php | 8 ++-- website/queries/user.php | 6 ++- website/views/notification-center.php | 2 +- website/views/profile.php | 5 +++ 15 files changed, 74 insertions(+), 15 deletions(-) diff --git a/website/public/API/loadChatNotifications.php b/website/public/API/loadChatNotifications.php index baceabc..8ef0aa5 100644 --- a/website/public/API/loadChatNotifications.php +++ b/website/public/API/loadChatNotifications.php @@ -6,6 +6,7 @@ require_once ("../../queries/connect.php"); require_once ("../../queries/private_message.php"); require_once("../../queries/user.php"); +// Check if the user is allowed to load them. if (isset($_SESSION["userID"]) && getRoleByID($_SESSION["userID"]) != 'banned') { echo selectAllUnreadChat(); diff --git a/website/public/API/loadFriendRequest.php b/website/public/API/loadFriendRequest.php index 91a1cc7..7eca6a8 100644 --- a/website/public/API/loadFriendRequest.php +++ b/website/public/API/loadFriendRequest.php @@ -6,6 +6,7 @@ require_once ("../../queries/connect.php"); require_once ("../../queries/friendship.php"); require_once ("../../queries/user.php"); +// Check if the user is allowed to load them. if (isset($_SESSION["userID"]) && getRoleByID($_SESSION["userID"]) != 'frozen' && getRoleByID($_SESSION["userID"]) != 'banned') { diff --git a/website/public/API/loadFriends.php b/website/public/API/loadFriends.php index b59b34c..13a25d8 100644 --- a/website/public/API/loadFriends.php +++ b/website/public/API/loadFriends.php @@ -7,9 +7,11 @@ require_once ("../../queries/checkInput.php"); require_once ("../../queries/friendship.php"); require_once("../../queries/user.php"); +// Check if the user is allowed to load them. if (isset($_SESSION["userID"]) && getRoleByID($_SESSION["userID"]) != 'banned') { if (isset($_SESSION["userID"])) { + // Echo the limited or unlimited users. if (isset($_POST["limit"])) { echo selectLimitedFriends($_SESSION["userID"], (int)test_input($_POST["limit"])); } else if (isset($_GET["limit"])) { diff --git a/website/public/API/loadGroups.php b/website/public/API/loadGroups.php index 3c562b1..5bbc111 100644 --- a/website/public/API/loadGroups.php +++ b/website/public/API/loadGroups.php @@ -8,8 +8,10 @@ require_once ("../../queries/group_member.php"); require_once("../../queries/user.php"); +// Check if the user is allowed to load them. if (isset($_SESSION["userID"]) && getRoleByID($_SESSION["userID"]) != 'banned') { + // Echo the limited or unlimited groups. if (isset($_POST["limit"])) { echo selectLimitedGroupsFromUser($_SESSION["userID"], (int)test_input($_POST["limit"])); } else { diff --git a/website/public/API/loadMessages.php b/website/public/API/loadMessages.php index d78d058..d1a7e15 100644 --- a/website/public/API/loadMessages.php +++ b/website/public/API/loadMessages.php @@ -8,8 +8,10 @@ require_once("../../queries/checkInput.php"); require_once("../../queries/friendship.php"); require_once("../../queries/user.php"); +// Check if the user is allowed to get the messages. if (isset($_SESSION["userID"]) && getRoleByID($_SESSION["userID"]) != 'banned') { + // Check if the users wants new messages or old ones, and give the right one back. if (isset($_POST["lastID"]) && $_POST["lastID"] != "") { setLastVisited(test_input($_POST["destination"])); echo getNewChatMessages(test_input($_POST["lastID"]), test_input($_POST["destination"])); diff --git a/website/public/API/sendMessage.php b/website/public/API/sendMessage.php index 2d0b092..c6e3231 100644 --- a/website/public/API/sendMessage.php +++ b/website/public/API/sendMessage.php @@ -6,12 +6,15 @@ require_once("../../queries/private_message.php"); require_once("../../queries/checkInput.php"); require_once("../../queries/user.php"); +// Check if the user is allowed to send a message. if (isset($_SESSION["userID"]) && getRoleByID($_SESSION["userID"]) != 'frozen' && getRoleByID($_SESSION["userID"]) != 'banned') { if (!empty(test_input($_POST["destination"])) && !empty(test_input($_POST["content"])) ) { + // Send the message. + // Returns false when it didn't succeed sending the message. if (sendMessage(test_input($_POST["destination"]), test_input($_POST["content"]))) { echo 1; } else { diff --git a/website/public/bits/friend-item.php b/website/public/bits/friend-item.php index 40bc8a8..181f9b6 100644 --- a/website/public/bits/friend-item.php +++ b/website/public/bits/friend-item.php @@ -4,6 +4,7 @@ session_start(); include_once ("../../queries/friendship.php"); +// Initialize variables to given or default values. if (isset($_POST["action"])) { $action = $_POST["action"]; } else { @@ -18,6 +19,8 @@ if (isset($_POST["actionType"])) { $friends = json_decode($_POST["friends"]); + +// Foreach friend, return them as list item. foreach($friends as $i => $friend) { $friendshipStatus = getFriendshipStatus($friend->userID); ?> @@ -48,6 +51,7 @@ foreach($friends as $i => $friend) { 1) { if ($friendshipStatus == 2) { $denyName = "Annuleer"; diff --git a/website/public/bits/group-item.php b/website/public/bits/group-item.php index 92eccfc..dbe799d 100644 --- a/website/public/bits/group-item.php +++ b/website/public/bits/group-item.php @@ -6,6 +6,7 @@ include_once ("../../queries/group_member.php"); $groups = json_decode($_POST["groups"]); +// Add each group as list item. foreach($groups as $i => $group) { ?>
  • diff --git a/website/public/js/chat.js b/website/public/js/chat.js index 6a027c8..3f28c81 100644 --- a/website/public/js/chat.js +++ b/website/public/js/chat.js @@ -9,13 +9,17 @@ $(document).ready(function() { $(".chat-field").hide(); }); +// This function loads the new messages and runs the addMessages function to show them. function loadMessages() { + // If the function is not running elsewhere, run it here. if (!gettingMessages) { gettingMessages = true; + // Get the messages. $.post( "API/loadMessages.php", $("#lastIDForm").serialize() ).done(function (data) { + // Post the messages in the chat. if (data && data != "[]") { messages = JSON.parse(data); addMessages(messages); @@ -28,7 +32,7 @@ function loadMessages() { } } - +// Send a message to a friend of the user. function sendMessage() { $.post( "API/sendMessage.php", @@ -37,42 +41,54 @@ function sendMessage() { if (response == "frozen") { alert("Je account is bevroren, dus je kan niet chat berichten versturen. Contacteer een admin als je denkt dat dit onjuist is."); } + // Load messages if the message has been send, so it shows in the chat. + loadMessages(); }); $("#newContent").val(""); - loadMessages(); } +// Add messages to the chat. function addMessages(messages) { var messagesText = ""; + + // Loop over all the messages. for(var i in messages) { - // Initialize message variables + // Initialize message variables. var thisDate = new Date(messages[i].creationdate.replace(/ /,"T")); var thisTime = thisDate.getHours() + ":" + thisDate.getMinutes(); var type; thisDate.setHours(0,0,0,0); + // See where the message has been send from, so it shows on the right side. if (messages[i].destination == $(".destinationID").val()) { type = "chat-message-self"; } else { type = "chat-message-other"; } + + // If it is the first message, open the message box and maybe add a year. if (i == 0) { + if (thisDate.getTime() > previousDate.getTime()) { + messagesText += '\ +
    \ +
    \ + ' + days[thisDate.getDay()] + " " + thisDate.getDate() + " " + months[thisDate.getMonth()] + " " + thisDate.getFullYear() + '\ +
    \ +
    '; + } previousDate = thisDate; - messagesText += '\ -
    \ -
    \ - ' + days[thisDate.getDay()] + " " + thisDate.getDate() + " " + months[thisDate.getMonth()] + " " + thisDate.getFullYear() + '\ -
    \ -
    '; messagesText += '
    '; + // If it is not the first message, and has a different date/time/type then the previous message, } else if (type != previousType || thisTime != previousTime || thisDate.getTime() > previousDate.getTime()) { + // Close the previous message. messagesText += '
    \ ' + thisTime + '\
    '; previousTime = thisTime; previousType = type; + // If the date is different, add a new date. if (thisDate > previousDate) { previousDate = thisDate; messagesText += '\ @@ -83,8 +99,11 @@ function addMessages(messages) {
    • '; } + // Open the new message. messagesText += '
    '; } + + // Add the content of the message in the new box. messagesText += fancyText(messages[i].content) + "
    "; } @@ -93,11 +112,14 @@ function addMessages(messages) { ' + thisTime + '\
    '; + // Add all the new created messaged to the chat. $("#chat-history").append(messagesText); + // Scroll down, so the user can see the new messages. $("#chat-history").scrollTop($("#chat-history")[0].scrollHeight - $('#chat-history')[0].clientHeight); } +// Switch to a different user. function switchUser(userID) { previousDate = new Date("1970-01-01 00:00:00"); $(".chat-field").show(); @@ -108,6 +130,7 @@ function switchUser(userID) { $("#friend-item-" + userID).addClass("active-friend-chat"); } +// Insert a message in the chat, this is used when it is empty. function sayEmpty() { $("#chat-history").html("Probeer ook eens foto's en video's te sturen"); } \ No newline at end of file diff --git a/website/public/js/main.js b/website/public/js/main.js index 7741406..4ea1ac1 100644 --- a/website/public/js/main.js +++ b/website/public/js/main.js @@ -38,6 +38,8 @@ function fancyText(text) { return text; } +// This function gets the value of a cookie when given a key. +// If didn´t find any compatible cookie, it returns false. function getCookie(key) { cookies = document.cookie.split("; "); for (var i in cookies) { @@ -49,6 +51,7 @@ function getCookie(key) { return false; } +// Edit the friendship status of two users. function editFriendship(userID, value) { $.post("API/editFriendship.php", { usr: userID, action: value }) .done(function() { @@ -57,6 +60,8 @@ function editFriendship(userID, value) { }); } +// Show the given friends in the given list. +// The friends are giving in JSON, and the list is giving with a hashtag. function showFriends(friends, list) { if(friends && friends != "[]") { $(list).load("bits/friend-item.php", { @@ -69,6 +74,8 @@ function showFriends(friends, list) { } } +// Show the given friends in the given list. +// This function supports more options given as parameters. This adds extra functionality. function showFriendsPlus(friends, list, limit, action, actionType) { if(friends && friends != "[]") { $(list).load("bits/friend-item.php", { @@ -84,6 +91,7 @@ function showFriendsPlus(friends, list, limit, action, actionType) { } } +// Show the given groups in the given list. function showGroups(groups, list) { if(groups && groups != "[]") { $(list).load("bits/group-item.php", { diff --git a/website/public/js/search.js b/website/public/js/search.js index f7c4bbe..affe758 100644 --- a/website/public/js/search.js +++ b/website/public/js/search.js @@ -2,6 +2,7 @@ $(window).on('load', function () { pageNumber(); }); +// Search for the users and put them in the user list. function searchUsers() { $.post( "API/searchUsers.php", @@ -13,6 +14,7 @@ function searchUsers() { }); } +// Search for the groups and put them in the group list. function searchGroups() { $.post( "API/searchGroups.php", @@ -24,6 +26,7 @@ function searchGroups() { }); } +// Get the page numbers and return them in the select. function pageNumber() { var input = input2 = $('#search-form').serialize(); $.post( diff --git a/website/queries/friendship.php b/website/queries/friendship.php index 7355af2..e1a8c53 100644 --- a/website/queries/friendship.php +++ b/website/queries/friendship.php @@ -10,7 +10,7 @@ function selectLimitedFriends($userID, $limit) { $stmt = prepareQuery(" SELECT `userID`, - LEFT(`username`, 17) as `username`, + LEFT(`username`, 12) as `username`, LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 12) as `fullname`, IFNULL( `profilepicture`, @@ -50,7 +50,7 @@ function selectAllFriends($userID) { $stmt = prepareQuery(" SELECT `userID`, - LEFT(`username`, 17) as `username`, + LEFT(`username`, 12) as `username`, LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 12) as `fullname`, IFNULL( `profilepicture`, @@ -85,7 +85,7 @@ function selectAllFriendRequests() { $stmt = prepareQuery(" SELECT `userID`, - LEFT(`username`, 17) as `username`, + LEFT(`username`, 12) as `username`, LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 12) as `fullname`, IFNULL( `profilepicture`, @@ -236,7 +236,7 @@ function searchSomeFriends($n, $m, $search) { SELECT `userID`, - LEFT(`username`, 17) as `username`, + LEFT(`username`, 12) as `username`, LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 12) as `fullname`, IFNULL( `profilepicture`, diff --git a/website/queries/user.php b/website/queries/user.php index 101c70c..72205ba 100644 --- a/website/queries/user.php +++ b/website/queries/user.php @@ -52,6 +52,10 @@ function selectUser($me, $other) { `username`, `birthdate`, `location`, + `showBday`, + `showEmail`, + `showProfile`, + `email`, IFNULL( `profilepicture`, '../img/avatar-standard.png' @@ -345,7 +349,7 @@ function searchSomeUsers($n, $m, $search) { $stmt = prepareQuery(" SELECT `userID`, - LEFT(`username`, 17) as `username`, + LEFT(`username`, 12) as `username`, IFNULL( `profilepicture`, '../img/avatar-standard.png' diff --git a/website/views/notification-center.php b/website/views/notification-center.php index 7bd03ea..f6f4a03 100644 --- a/website/views/notification-center.php +++ b/website/views/notification-center.php @@ -14,7 +14,7 @@ echo ""; } ?> - +

    diff --git a/website/views/profile.php b/website/views/profile.php index 2bb117f..e8aa8c9 100644 --- a/website/views/profile.php +++ b/website/views/profile.php @@ -29,7 +29,12 @@

    Informatie

      +
    • Leeftijd: jaar
      • + + +
    • Email:
      • +
    • Locatie:
    • Lid sinds:
    From 04df02862f223c48565cb7bef5875c4b9e97bb8d Mon Sep 17 00:00:00 2001 From: Marijn Jansen Date: Thu, 2 Feb 2017 10:52:42 +0100 Subject: [PATCH 06/37] More Awesome Fonts :D --- website/public/js/masonry.js | 2 +- website/public/styles/profile.css | 2 +- website/views/post-view.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/website/public/js/masonry.js b/website/public/js/masonry.js index 4f638c2..190a26f 100644 --- a/website/public/js/masonry.js +++ b/website/public/js/masonry.js @@ -120,7 +120,7 @@ function masonry(mode) { $form.append($("")); $form.append($("")); - $form.append($("")); + $form.append($("")); columns[0][1].append($postInput); columns[0][0] = $postInput.height() + margin; diff --git a/website/public/styles/profile.css b/website/public/styles/profile.css index 1bacafa..2370da8 100644 --- a/website/public/styles/profile.css +++ b/website/public/styles/profile.css @@ -108,7 +108,7 @@ div.posts .post form input, div.posts .post form textarea { width: calc(100% - 15px); } -div.posts .post form input[type="submit"] { +div.posts .post form input[type="submit"], .post button{ width: 100%; } diff --git a/website/views/post-view.php b/website/views/post-view.php index da1c86f..f8fe902 100644 --- a/website/views/post-view.php +++ b/website/views/post-view.php @@ -30,7 +30,7 @@ $fullname = $post['fname'] . " " . $post['lname'] . " (" . $post['username'] . "

    - + "; + ""; } // Add ogg video's else if (link.match(/(https?:\/\/.[^ ]*\.(?:ogg))/ig)) { return ""; + ""; } // Add youtube video's else if (link.match(/(https?:\/\/.(www.)?youtube|youtu.be)*watch/ig)) { diff --git a/website/public/styles/main.css b/website/public/styles/main.css index 226a96d..650a30f 100644 --- a/website/public/styles/main.css +++ b/website/public/styles/main.css @@ -116,7 +116,7 @@ p { @media only screen and (max-width: 1400px) { .item-box { - width: calc(100% - 50px); + width: calc(100% - 50px)!important; } } diff --git a/website/public/styles/settings.css b/website/public/styles/settings.css index 933e7fd..6a2c2f2 100644 --- a/website/public/styles/settings.css +++ b/website/public/styles/settings.css @@ -32,6 +32,11 @@ text-align: right; } +.settings-password, .settings-email { + width: calc(50% - 60px); + display: inline-flex; +} + .settings-password label, .settings-email label { text-align: left; } diff --git a/website/views/head.php b/website/views/head.php index 284abb4..c4d13a5 100644 --- a/website/views/head.php +++ b/website/views/head.php @@ -1,4 +1,8 @@ - + + + + + MyHyvesbook+ From 327a6a8f5cb5f8ca04508548dd3f6d3062e5264d Mon Sep 17 00:00:00 2001 From: Lars van Hijfte Date: Thu, 2 Feb 2017 12:52:03 +0100 Subject: [PATCH 08/37] BUG FIX: username doesn't cut off in link --- website/public/bits/friend-item.php | 2 +- website/queries/friendship.php | 13 ++++++++----- website/queries/user.php | 3 ++- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/website/public/bits/friend-item.php b/website/public/bits/friend-item.php index 181f9b6..6a0c868 100644 --- a/website/public/bits/friend-item.php +++ b/website/public/bits/friend-item.php @@ -41,7 +41,7 @@ foreach($friends as $i => $friend) { fullname ?>
    username)) { - echo $friend->username; + echo $friend->usernameshort; } else if (isset($friend->content)) { echo $friend->content; } diff --git a/website/queries/friendship.php b/website/queries/friendship.php index e1a8c53..6ea6313 100644 --- a/website/queries/friendship.php +++ b/website/queries/friendship.php @@ -10,7 +10,8 @@ function selectLimitedFriends($userID, $limit) { $stmt = prepareQuery(" SELECT `userID`, - LEFT(`username`, 12) as `username`, + LEFT(`username`, 12) as `usernameshort`, + `username`, LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 12) as `fullname`, IFNULL( `profilepicture`, @@ -50,7 +51,8 @@ function selectAllFriends($userID) { $stmt = prepareQuery(" SELECT `userID`, - LEFT(`username`, 12) as `username`, + LEFT(`username`, 12) as `usernameshort`, + `username`, LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 12) as `fullname`, IFNULL( `profilepicture`, @@ -85,7 +87,8 @@ function selectAllFriendRequests() { $stmt = prepareQuery(" SELECT `userID`, - LEFT(`username`, 12) as `username`, + LEFT(`username`, 12) as `usernameshort`, + `username`, LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 12) as `fullname`, IFNULL( `profilepicture`, @@ -235,8 +238,8 @@ function searchSomeFriends($n, $m, $search) { $stmt = prepareQuery(" SELECT `userID`, - - LEFT(`username`, 12) as `username`, + LEFT(`username`, 12) as `usernameshort`, + `username`, LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 12) as `fullname`, IFNULL( `profilepicture`, diff --git a/website/queries/user.php b/website/queries/user.php index 72205ba..1e54763 100644 --- a/website/queries/user.php +++ b/website/queries/user.php @@ -349,7 +349,8 @@ function searchSomeUsers($n, $m, $search) { $stmt = prepareQuery(" SELECT `userID`, - LEFT(`username`, 12) as `username`, + LEFT(`username`, 12) as `usernameshort`, + `username`, IFNULL( `profilepicture`, '../img/avatar-standard.png' From 86b02973e4887022619cff121379f9fd5da50998 Mon Sep 17 00:00:00 2001 From: "K. Nobel" Date: Thu, 2 Feb 2017 13:02:00 +0100 Subject: [PATCH 09/37] Fixed visibility on profiles --- website/public/profile.php | 6 ++++++ website/queries/user.php | 4 ++++ website/views/profile.php | 7 +++++-- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/website/public/profile.php b/website/public/profile.php index 05c661d..d9a317c 100644 --- a/website/public/profile.php +++ b/website/public/profile.php @@ -21,13 +21,19 @@ include_once("../queries/calcAge.php"); if(empty($_GET["username"])) { $userID = $_SESSION["userID"]; + $showProfile = True; } else { $userID = getUserID($_GET["username"]); + $showProfile = False; } $user = selectUser($_SESSION["userID"], $userID); $profile_friends = selectAllFriends($userID); $profile_groups = selectAllUserGroups($userID); +$showProfile = $showProfile || $user["showProfile"] || ($user["status"] == 'confirmed'); +echo " friendship status: " . $user["status"]; +echo " showprofile: $showProfile"; +echo " userID: " . $user["userID"]; if ($userID == $_SESSION["userID"]) { diff --git a/website/queries/user.php b/website/queries/user.php index 33a85a1..74b0aa1 100644 --- a/website/queries/user.php +++ b/website/queries/user.php @@ -65,6 +65,10 @@ function selectUser($me, $other) { `role`, `fname`, `lname`, + `showBday`, + `showEmail`, + `showProfile`, + `status`, CASE `status` IS NULL WHEN TRUE THEN 0 WHEN FALSE THEN diff --git a/website/views/profile.php b/website/views/profile.php index 2bb117f..1e88af8 100644 --- a/website/views/profile.php +++ b/website/views/profile.php @@ -15,16 +15,18 @@

    - " . $user["bio"] . "

    "; } ?>
    - 50) { + 50 and $showProfile) { echo "

    Bio:

    " . $user["bio"] . "

    "; } ?> +

    Informatie

    @@ -85,4 +87,5 @@

    + \ No newline at end of file From 9d675dd897b01d2a5e4e13a124ab9944b2b63a46 Mon Sep 17 00:00:00 2001 From: "K. Nobel" Date: Thu, 2 Feb 2017 13:11:05 +0100 Subject: [PATCH 10/37] Fixed default image for group members. --- website/queries/group_page.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/website/queries/group_page.php b/website/queries/group_page.php index 511ff4d..b66ca54 100644 --- a/website/queries/group_page.php +++ b/website/queries/group_page.php @@ -81,7 +81,10 @@ function selectGroupMembers(int $groupID) { `username`, `fname`, `lname`, - `profilepicture` + IFNULL( + `profilepicture`, + '../img/avatar-standard.png' + ) AS profilepicture FROM `group_member` LEFT JOIN From d4d16661dffb7ecf3c64eea28aff40aa8e4a4c4a Mon Sep 17 00:00:00 2001 From: Hendrik Date: Thu, 2 Feb 2017 13:42:59 +0100 Subject: [PATCH 11/37] added alert box when emptpy posting --- website/public/API/postPost.php | 51 ++++++++++++++++--------------- website/public/js/masonry.js | 25 ++++++++++----- website/public/js/post.js | 2 ++ website/public/styles/profile.css | 5 +++ website/views/profile.php | 4 +++ 5 files changed, 56 insertions(+), 31 deletions(-) diff --git a/website/public/API/postPost.php b/website/public/API/postPost.php index b1c6649..241bda6 100644 --- a/website/public/API/postPost.php +++ b/website/public/API/postPost.php @@ -12,36 +12,39 @@ if (isset($_SESSION["userID"]) && getRoleByID($_SESSION["userID"]) != 'frozen' && getRoleByID($_SESSION["userID"]) != 'banned') { - if (empty($_POST["title"]) or - empty($_POST["content"]) or - empty($_SESSION["userID"]) - ) { + if (empty($_SESSION["userID"])) { header('HTTP/1.1 500 Non enough arguments'); } - if (empty($_POST["group"])) { - // User Post - makePost( - $_SESSION["userID"], - null, - test_input($_POST["title"]), - test_input($_POST["content"]) - ); + if (empty(test_input($_POST["title"])) or + empty(test_input($_POST["content"])) + ) { + echo "empty"; } else { - // Group Post + if (empty($_POST["group"])) { + // User Post + makePost( + $_SESSION["userID"], + null, + test_input($_POST["title"]), + test_input($_POST["content"]) + ); + } else { + // Group Post - // Check if the user is an admin or mod of the group. - if (!in_array(selectGroupRole($_POST["group"]), array('mod', 'admin'))) { - header('HTTP/1.1 500 Non enough rights'); - return; + // Check if the user is an admin or mod of the group. + if (!in_array(selectGroupRole($_POST["group"]), array('mod', 'admin'))) { + header('HTTP/1.1 500 Non enough rights'); + return; + } + + makePost( + $_SESSION["userID"], + $_POST["group"], + test_input($_POST["title"]), + test_input($_POST["content"]) + ); } - - makePost( - $_SESSION["userID"], - $_POST["group"], - test_input($_POST["title"]), - test_input($_POST["content"]) - ); } } else { echo "frozen"; diff --git a/website/public/js/masonry.js b/website/public/js/masonry.js index 4f638c2..d0d2074 100644 --- a/website/public/js/masonry.js +++ b/website/public/js/masonry.js @@ -31,14 +31,28 @@ function postPost() { $.post("API/postPost.php", { title: title, content : content, group : groupID }) - .done(function() { - masonry(masonryMode); + .done(function(data) { + if (data == "empty") { + $('#alertbox').show(); + $('#alerttext').html("Geen titel of inhoud; vul a.u.b. in."); + window.scrollTo(0,0); + } else { + $('#alertbox').hide(); + masonry(masonryMode); + } }); } else { $.post("API/postPost.php", { title: title, content : content }) - .done(function() { - masonry(masonryMode); + .done(function(data) { + if (data == "empty") { + $('#alertbox').show(); + $('#alerttext').html("Geen titel of inhoud; vul a.u.b. in."); + window.scrollTo(0,0); + } else { + $('#alertbox').hide(); + masonry(masonryMode); + } }); } @@ -153,9 +167,6 @@ function loadMorePosts(uID, gID, offset, limit) { return; } - console.log(uID, gID, offset, limit); - - $.post("API/getPosts.php", { usr : uID, grp : gID, offset : offset, diff --git a/website/public/js/post.js b/website/public/js/post.js index f176950..7c73793 100644 --- a/website/public/js/post.js +++ b/website/public/js/post.js @@ -32,6 +32,8 @@ function deletePost(postID) { alert("Je account is bevroren, dus je kan geen posts verwijderen. Contacteer een admin als je denkt dat dit onjuist is."); } }); + noposts = false; + postAmount = 0; closeModal(); masonry(masonryMode); diff --git a/website/public/styles/profile.css b/website/public/styles/profile.css index 1bacafa..27d2bdd 100644 --- a/website/public/styles/profile.css +++ b/website/public/styles/profile.css @@ -1,5 +1,10 @@ /* New */ +.alertbox { + display: none; + background-color: firebrick; +} + .user-box { text-align: center; } diff --git a/website/views/profile.php b/website/views/profile.php index 2bb117f..120dae4 100644 --- a/website/views/profile.php +++ b/website/views/profile.php @@ -1,4 +1,8 @@
    +
    + +
    +
    " src="">
    From feba1d978627948b73445a0016c1bd51e7d3bcd9 Mon Sep 17 00:00:00 2001 From: Hendrik Date: Thu, 2 Feb 2017 13:47:41 +0100 Subject: [PATCH 12/37] fix reload after posting post --- website/public/js/masonry.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/website/public/js/masonry.js b/website/public/js/masonry.js index 7128a8a..5a4ca4c 100644 --- a/website/public/js/masonry.js +++ b/website/public/js/masonry.js @@ -38,6 +38,8 @@ function postPost() { window.scrollTo(0,0); } else { $('#alertbox').hide(); + noposts = false; + postAmount = 0; masonry(masonryMode); } }); @@ -51,6 +53,8 @@ function postPost() { window.scrollTo(0,0); } else { $('#alertbox').hide(); + noposts = false; + postAmount = 0; masonry(masonryMode); } }); From 93e63111de4738629b0921cc5ca9882ef35a7581 Mon Sep 17 00:00:00 2001 From: Hendrik Date: Thu, 2 Feb 2017 13:54:52 +0100 Subject: [PATCH 13/37] cleaned fix --- website/public/js/masonry.js | 8 ++++---- website/public/js/post.js | 2 -- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/website/public/js/masonry.js b/website/public/js/masonry.js index 5a4ca4c..a628e96 100644 --- a/website/public/js/masonry.js +++ b/website/public/js/masonry.js @@ -38,8 +38,6 @@ function postPost() { window.scrollTo(0,0); } else { $('#alertbox').hide(); - noposts = false; - postAmount = 0; masonry(masonryMode); } }); @@ -53,8 +51,6 @@ function postPost() { window.scrollTo(0,0); } else { $('#alertbox').hide(); - noposts = false; - postAmount = 0; masonry(masonryMode); } }); @@ -116,6 +112,10 @@ function masonry(mode) { masonryMode = mode; $container.children().remove(); + // reinit posts + noposts = false; + postAmount = 0; + /* * Initialise columns. */ diff --git a/website/public/js/post.js b/website/public/js/post.js index 20da034..4009023 100644 --- a/website/public/js/post.js +++ b/website/public/js/post.js @@ -32,8 +32,6 @@ function deletePost(postID) { alert("Je account is bevroren, dus je kan geen posts verwijderen. Contacteer een admin als je denkt dat dit onjuist is."); } }); - noposts = false; - postAmount = 0; closeModal(); masonry(masonryMode); } \ No newline at end of file From d24ed8909681d7cf9f85d5e20f41d6b6ad2d87a0 Mon Sep 17 00:00:00 2001 From: Lars van Hijfte Date: Thu, 2 Feb 2017 14:04:59 +0100 Subject: [PATCH 14/37] BUG FIX: mobile support fix --- website/public/bits/niet_slecht.php | 7 +++++++ website/public/js/chat.js | 3 +++ website/views/head.php | 1 - 3 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 website/public/bits/niet_slecht.php diff --git a/website/public/bits/niet_slecht.php b/website/public/bits/niet_slecht.php new file mode 100644 index 0000000..05b981a --- /dev/null +++ b/website/public/bits/niet_slecht.php @@ -0,0 +1,7 @@ + - MyHyvesbook+ From 417124a1fed22f85cd86615e83df488455baeb30 Mon Sep 17 00:00:00 2001 From: Lars van Hijfte Date: Thu, 2 Feb 2017 14:13:20 +0100 Subject: [PATCH 15/37] BUG FIX: added 0 in chat time if needed --- website/public/js/chat.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/website/public/js/chat.js b/website/public/js/chat.js index 1141334..a3ff430 100644 --- a/website/public/js/chat.js +++ b/website/public/js/chat.js @@ -59,7 +59,7 @@ function addMessages(messages) { for(var i in messages) { // Initialize message variables. var thisDate = new Date(messages[i].creationdate.replace(/ /,"T")); - var thisTime = thisDate.getHours() + ":" + thisDate.getMinutes(); + var thisTime = thisDate.getHours() + ":" + ('0' + thisDate.getMinutes()).slice(-2); var type; thisDate.setHours(0,0,0,0); @@ -81,6 +81,8 @@ function addMessages(messages) {
    '; } previousDate = thisDate; + previousTime = thisTime; + previousType = type; messagesText += '
    '; // If it is not the first message, and has a different date/time/type then the previous message, } else if (type != previousType || thisTime != previousTime || thisDate.getTime() > previousDate.getTime()) { From 4a7a91ecd964f1cb0827765078314d04ac6534dc Mon Sep 17 00:00:00 2001 From: "K. Nobel" Date: Thu, 2 Feb 2017 14:20:17 +0100 Subject: [PATCH 16/37] Fixed bug (not showing profile when on own profile) --- website/public/profile.php | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/website/public/profile.php b/website/public/profile.php index d9a317c..aa4cf7c 100644 --- a/website/public/profile.php +++ b/website/public/profile.php @@ -21,19 +21,14 @@ include_once("../queries/calcAge.php"); if(empty($_GET["username"])) { $userID = $_SESSION["userID"]; - $showProfile = True; } else { $userID = getUserID($_GET["username"]); - $showProfile = False; } $user = selectUser($_SESSION["userID"], $userID); $profile_friends = selectAllFriends($userID); $profile_groups = selectAllUserGroups($userID); -$showProfile = $showProfile || $user["showProfile"] || ($user["status"] == 'confirmed'); -echo " friendship status: " . $user["status"]; -echo " showprofile: $showProfile"; -echo " userID: " . $user["userID"]; +$showProfile = $user["showProfile"] || ($user["status"] == 'confirmed') || $_SESSION["userID"] == $userID; if ($userID == $_SESSION["userID"]) { From 188741ddf5ded574767a0115f06af8bd2a97487b Mon Sep 17 00:00:00 2001 From: Lars van Hijfte Date: Thu, 2 Feb 2017 14:22:13 +0100 Subject: [PATCH 17/37] BUG FIX: link in fancy text now opens in new tab --- website/public/js/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/public/js/main.js b/website/public/js/main.js index b6ab703..30cd3ed 100644 --- a/website/public/js/main.js +++ b/website/public/js/main.js @@ -31,7 +31,7 @@ function fancyText(text) { } // Add links else { - return "" + link + ""; + return "" + link + ""; } }); From 1672ce6086deed96f1325a3044e9fe9c632adaf6 Mon Sep 17 00:00:00 2001 From: Lars van Hijfte Date: Thu, 2 Feb 2017 14:23:36 +0100 Subject: [PATCH 18/37] Changed offline status to 5 minutes after inactive --- website/queries/friendship.php | 8 ++++---- website/queries/user.php | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/website/queries/friendship.php b/website/queries/friendship.php index 7edada9..3dcd53b 100644 --- a/website/queries/friendship.php +++ b/website/queries/friendship.php @@ -17,7 +17,7 @@ function selectLimitedFriends($userID, $limit) { `profilepicture`, '../img/avatar-standard.png' ) AS profilepicture, - CASE `lastactivity` >= DATE_SUB(NOW(),INTERVAL 15 MINUTE) + CASE `lastactivity` >= DATE_SUB(NOW(),INTERVAL 5 MINUTE) WHEN TRUE THEN 'online' WHEN FALSE THEN 'offline' END AS `onlinestatus`, @@ -58,7 +58,7 @@ function selectAllFriends($userID) { `profilepicture`, '../img/avatar-standard.png' ) AS profilepicture, - CASE `lastactivity` >= DATE_SUB(NOW(),INTERVAL 15 MINUTE) + CASE `lastactivity` >= DATE_SUB(NOW(),INTERVAL 5 MINUTE) WHEN TRUE THEN 'online' WHEN FALSE THEN 'offline' END AS `onlinestatus`, @@ -94,7 +94,7 @@ function selectAllFriendRequests() { `profilepicture`, '../img/avatar-standard.png' ) AS profilepicture, - CASE `lastactivity` >= DATE_SUB(NOW(),INTERVAL 15 MINUTE) + CASE `lastactivity` >= DATE_SUB(NOW(),INTERVAL 5 MINUTE) WHEN TRUE THEN 'online' WHEN FALSE THEN 'offline' END AS `onlinestatus`, @@ -245,7 +245,7 @@ function searchSomeFriends($n, $m, $search) { `profilepicture`, '../img/avatar-standard.png' ) AS profilepicture, - CASE `lastactivity` >= DATE_SUB(NOW(),INTERVAL 15 MINUTE) + CASE `lastactivity` >= DATE_SUB(NOW(),INTERVAL 5 MINUTE) WHEN TRUE THEN 'online' WHEN FALSE THEN 'offline' END AS `onlinestatus`, diff --git a/website/queries/user.php b/website/queries/user.php index e8bda13..7b8ef3f 100644 --- a/website/queries/user.php +++ b/website/queries/user.php @@ -62,7 +62,7 @@ function selectUser($me, $other) { ) AS profilepicture, `bio`, `user`.`creationdate`, - CASE `lastactivity` >= DATE_SUB(NOW(),INTERVAL 15 MINUTE) + CASE `lastactivity` >= DATE_SUB(NOW(),INTERVAL 5 MINUTE) WHEN TRUE THEN 'online' WHEN FALSE THEN 'offline' END AS `onlinestatus`, @@ -131,7 +131,7 @@ function select20UsersFromN($n) { `username`, `role`, `bancomment`, - CASE `lastactivity` >= DATE_SUB(NOW(),INTERVAL 15 MINUTE) + CASE `lastactivity` >= DATE_SUB(NOW(),INTERVAL 5 MINUTE) WHEN TRUE THEN 'online' WHEN FALSE THEN 'offline' END AS `onlinestatus` @@ -156,7 +156,7 @@ function search20UsersFromN($n, $keyword) { `username`, `role`, `bancomment`, - CASE `lastactivity` >= DATE_SUB(NOW(),INTERVAL 15 MINUTE) + CASE `lastactivity` >= DATE_SUB(NOW(),INTERVAL 5 MINUTE) WHEN TRUE THEN 'online' WHEN FALSE THEN 'offline' END AS `onlinestatus` @@ -184,7 +184,7 @@ function search20UsersFromNByStatus($n, $keyword, $status) { `username`, `role`, `bancomment`, - CASE `lastactivity` >= DATE_SUB(NOW(),INTERVAL 15 MINUTE) + CASE `lastactivity` >= DATE_SUB(NOW(),INTERVAL 5 MINUTE) WHEN TRUE THEN 'online' WHEN FALSE THEN 'offline' END AS `onlinestatus` @@ -218,7 +218,7 @@ function searchSomeUsersByStatus($n, $m, $search, $status) { `username`, `role`, `bancomment`, - CASE `lastactivity` >= DATE_SUB(NOW(),INTERVAL 15 MINUTE) + CASE `lastactivity` >= DATE_SUB(NOW(),INTERVAL 5 MINUTE) WHEN TRUE THEN 'online' WHEN FALSE THEN 'offline' END AS `onlinestatus` @@ -362,7 +362,7 @@ function searchSomeUsers($n, $m, $search) { '../img/avatar-standard.png' ) AS profilepicture, LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 12) as `fullname`, - CASE `lastactivity` >= DATE_SUB(NOW(),INTERVAL 15 MINUTE) + CASE `lastactivity` >= DATE_SUB(NOW(),INTERVAL 5 MINUTE) WHEN TRUE THEN 'online' WHEN FALSE THEN 'offline' END AS `onlinestatus` From 6fc2f715176a34529d129a0f1a79d4d57f9ae659 Mon Sep 17 00:00:00 2001 From: Lars van Hijfte Date: Thu, 2 Feb 2017 14:27:23 +0100 Subject: [PATCH 19/37] Added meta data in the login page --- website/views/login_head.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/website/views/login_head.php b/website/views/login_head.php index e319a9d..bb7d7cf 100644 --- a/website/views/login_head.php +++ b/website/views/login_head.php @@ -1,5 +1,8 @@ - + + + + MyHyvesbook+ Date: Thu, 2 Feb 2017 14:50:51 +0100 Subject: [PATCH 20/37] Added "add group" under group menu --- website/views/menu.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/website/views/menu.php b/website/views/menu.php index dab8fce..1c1cf01 100644 --- a/website/views/menu.php +++ b/website/views/menu.php @@ -12,6 +12,8 @@ + +
    • From 33399639b1278e893460322514be2083f9af91d9 Mon Sep 17 00:00:00 2001 From: Lars van Hijfte Date: Thu, 2 Feb 2017 14:51:37 +0100 Subject: [PATCH 21/37] Added support for iframe "niet slecht" --- website/public/bits/niet-slecht.php | 8 ++++++++ website/public/bits/niet_slecht.php | 7 ------- 2 files changed, 8 insertions(+), 7 deletions(-) create mode 100644 website/public/bits/niet-slecht.php delete mode 100644 website/public/bits/niet_slecht.php diff --git a/website/public/bits/niet-slecht.php b/website/public/bits/niet-slecht.php new file mode 100644 index 0000000..432fe41 --- /dev/null +++ b/website/public/bits/niet-slecht.php @@ -0,0 +1,8 @@ + +\"Niet slecht\" ons op MyHyvesbook+ diff --git a/website/public/bits/niet_slecht.php b/website/public/bits/niet_slecht.php deleted file mode 100644 index 05b981a..0000000 --- a/website/public/bits/niet_slecht.php +++ /dev/null @@ -1,7 +0,0 @@ - Date: Thu, 2 Feb 2017 14:57:50 +0100 Subject: [PATCH 22/37] Added uderline in link posts --- website/public/styles/post-popup.css | 4 ++++ website/public/styles/profile.css | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/website/public/styles/post-popup.css b/website/public/styles/post-popup.css index 3f37ffd..24badcb 100644 --- a/website/public/styles/post-popup.css +++ b/website/public/styles/post-popup.css @@ -48,6 +48,10 @@ width: 90%; } +.post-content a { + text-decoration: underline; +} + .commentfield { margin-bottom: 20px; } diff --git a/website/public/styles/profile.css b/website/public/styles/profile.css index dbb3d24..a69414c 100644 --- a/website/public/styles/profile.css +++ b/website/public/styles/profile.css @@ -94,6 +94,10 @@ div.posts div.post { word-wrap: break-word; } +div.posts div.post a { + text-decoration: underline; +} + div.posts div.post:hover { box-shadow: 0 10px 20px rgba(0,0,0,0.19), 0 6px 6px rgba(0,0,0,0.23); } From 9426f4d6acfaa759254944587197e0e4e04bc5b1 Mon Sep 17 00:00:00 2001 From: Hendrik Date: Thu, 2 Feb 2017 15:00:01 +0100 Subject: [PATCH 23/37] add name field check in settings --- website/public/settings.php | 2 +- website/queries/settings.php | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/website/public/settings.php b/website/public/settings.php index e40f042..9247d26 100644 --- a/website/public/settings.php +++ b/website/public/settings.php @@ -18,7 +18,7 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") { try { switch ($_POST["form"]) { case "profile": - updateSettings(); + checkUpdateSettings(); break; case "password": changePassword(); diff --git a/website/queries/settings.php b/website/queries/settings.php index dfd65a0..9b17d17 100644 --- a/website/queries/settings.php +++ b/website/queries/settings.php @@ -50,6 +50,15 @@ function getPasswordHash() { return $stmt->fetch(); } +function checkUpdateSettings() { + if (empty(test_input($_POST['fname'])) || empty(test_input($_POST['lname']))) { + throw new AngryAlert("Geen voornaam of achternaam."); + return; + } + + updateSettings(); +} + /** * Changes the setting from post. * @throws HappyAlert From e60578dc43ed51810e6c54bc0e8105d14a53db38 Mon Sep 17 00:00:00 2001 From: Hendrik Date: Thu, 2 Feb 2017 15:11:41 +0100 Subject: [PATCH 24/37] add unvalidated option and fixed text --- website/views/adminpanel-grouptable.php | 10 +++++----- website/views/adminpanel-table.php | 3 ++- website/views/adminpanel.php | 15 ++++++++------- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/website/views/adminpanel-grouptable.php b/website/views/adminpanel-grouptable.php index 9d2c8e8..2449b3d 100644 --- a/website/views/adminpanel-grouptable.php +++ b/website/views/adminpanel-grouptable.php @@ -1,8 +1,8 @@ - Gebruikersnaam + Groepsnaam Status - Aantekening + Beschrijving Actie @@ -33,9 +33,9 @@ while ($group = $q->fetch(PDO::FETCH_ASSOC)) { diff --git a/website/views/adminpanel-table.php b/website/views/adminpanel-table.php index aa790e6..f7bc966 100644 --- a/website/views/adminpanel-table.php +++ b/website/views/adminpanel-table.php @@ -55,7 +55,8 @@ while($user = $q->fetch(PDO::FETCH_ASSOC)) { OR $user['role'] == 'owner'))) { echo " - "; + + "; if ($userinfo == 'owner') { echo " diff --git a/website/views/adminpanel.php b/website/views/adminpanel.php index a4da648..2c0bec2 100644 --- a/website/views/adminpanel.php +++ b/website/views/adminpanel.php @@ -67,13 +67,13 @@ if (isset($_GET["groupstatus"])) { id="frozen" value="frozen" > -
      +
      > -
      +
      > - +
    @@ -122,6 +122,7 @@ if (isset($_GET["groupstatus"])) { + Maak Owner"; + value=\"owner\">Maak Eigenaar"; } ?> @@ -139,9 +140,9 @@ if (isset($_GET["groupstatus"])) { onsubmit="adminUpdate(this); return false;"> - - - + + +
    From cfa7c870f08417b80d5d7c285207deb0e94db228 Mon Sep 17 00:00:00 2001 From: Hendrik Date: Thu, 2 Feb 2017 15:13:35 +0100 Subject: [PATCH 25/37] fix profile error color --- website/public/styles/profile.css | 4 ++++ website/views/profile.php | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/website/public/styles/profile.css b/website/public/styles/profile.css index dbb3d24..46906d2 100644 --- a/website/public/styles/profile.css +++ b/website/public/styles/profile.css @@ -5,6 +5,10 @@ background-color: firebrick; } +.alerttext { + color: white; +} + .user-box { text-align: center; } diff --git a/website/views/profile.php b/website/views/profile.php index 7348642..4139099 100644 --- a/website/views/profile.php +++ b/website/views/profile.php @@ -1,6 +1,6 @@
    - +
    From 8a3cfebf55bbc8380034c25741f52682beb2b9aa Mon Sep 17 00:00:00 2001 From: "K. Nobel" Date: Thu, 2 Feb 2017 15:34:45 +0100 Subject: [PATCH 26/37] Redirect to 404 from profile and group --- website/public/group.php | 9 ++++++++- website/public/profile.php | 7 ++++++- website/queries/group_page.php | 7 ++++++- website/queries/user.php | 4 +++- 4 files changed, 23 insertions(+), 4 deletions(-) diff --git a/website/public/group.php b/website/public/group.php index bb393e3..84726fa 100644 --- a/website/public/group.php +++ b/website/public/group.php @@ -13,9 +13,16 @@ include_once("../queries/group_page.php"); -$group = selectGroupByName($_GET["groupname"]); +if(!$group = selectGroupByName($_GET["groupname"])) { + header("HTTP/1.0 404 Not Found"); + header("Location: error/404.php"); + die(); +} + + $members = selectGroupMembers($group["groupID"]); + /* * This view adds the main layout over the screen. * Header, menu, footer. diff --git a/website/public/profile.php b/website/public/profile.php index aa4cf7c..126c87f 100644 --- a/website/public/profile.php +++ b/website/public/profile.php @@ -25,7 +25,12 @@ if(empty($_GET["username"])) { $userID = getUserID($_GET["username"]); } -$user = selectUser($_SESSION["userID"], $userID); +if(!$user = selectUser($_SESSION["userID"], $userID)) { + header("HTTP/1.0 404 Not Found"); + header("Location: error/404.php"); + die(); +} + $profile_friends = selectAllFriends($userID); $profile_groups = selectAllUserGroups($userID); $showProfile = $user["showProfile"] || ($user["status"] == 'confirmed') || $_SESSION["userID"] == $userID; diff --git a/website/queries/group_page.php b/website/queries/group_page.php index f2f028f..a6676c4 100644 --- a/website/queries/group_page.php +++ b/website/queries/group_page.php @@ -33,7 +33,12 @@ function selectGroupByName($name) { if (!$stmt->execute()) { return False; } - return $stmt->fetch(); + $row = $stmt->fetch(); + if($row["groupID"] == null) { + return False; + } + + return $row; } function selectGroupRole(int $groupID) { diff --git a/website/queries/user.php b/website/queries/user.php index 972937d..836c956 100644 --- a/website/queries/user.php +++ b/website/queries/user.php @@ -101,7 +101,9 @@ function selectUser($me, $other) { $stmt->bindParam(':me', $me, PDO::PARAM_INT); $stmt->bindParam(':other', $other, PDO::PARAM_INT); - $stmt->execute(); + if(!$stmt->execute() || $stmt->rowCount() == 0) { + return False; + } return $stmt->fetch(); } From 1c53eab2fa77c02aaeb7340a38b053d38c0cf335 Mon Sep 17 00:00:00 2001 From: "K. Nobel" Date: Thu, 2 Feb 2017 15:50:12 +0100 Subject: [PATCH 27/37] Fixed user group list on profile page. --- website/queries/user.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/queries/user.php b/website/queries/user.php index 06487be..422edc4 100644 --- a/website/queries/user.php +++ b/website/queries/user.php @@ -122,7 +122,7 @@ function selectAllUserGroups($userID) { `group_page`.`groupID` = `group_member`.`groupID` WHERE `userID` = :userID AND - `role` = 'member' + `role` IN ('member', 'mod', 'admin') "); $stmt->bindParam(':userID', $userID, PDO::PARAM_INT); From 380d8fa83a7ea8780f09fd8c1a8df7965b8f45b1 Mon Sep 17 00:00:00 2001 From: Marijn Jansen Date: Thu, 2 Feb 2017 16:01:45 +0100 Subject: [PATCH 28/37] Group Shit --- website/public/createGroup.php | 36 +++++++++++++++ website/public/groupAdmin.php | 46 ++++++++++++++++++++ website/queries/createGroup.php | 37 ++++++++++++++++ website/queries/groupAdmin.php | 61 ++++++++++++++++++++++++++ website/queries/picture.php | 12 ++--- website/views/createGroup.php | 42 ++++++++++++++++++ website/views/groupAdmin.php | 77 +++++++++++++++++++++++++++++++++ website/views/menu.php | 2 +- 8 files changed, 306 insertions(+), 7 deletions(-) create mode 100644 website/public/createGroup.php create mode 100644 website/public/groupAdmin.php create mode 100644 website/queries/createGroup.php create mode 100644 website/queries/groupAdmin.php create mode 100644 website/views/createGroup.php create mode 100644 website/views/groupAdmin.php diff --git a/website/public/createGroup.php b/website/public/createGroup.php new file mode 100644 index 0000000..ffeb6e3 --- /dev/null +++ b/website/public/createGroup.php @@ -0,0 +1,36 @@ + + + + + + + + + + + diff --git a/website/public/groupAdmin.php b/website/public/groupAdmin.php new file mode 100644 index 0000000..13ff7e0 --- /dev/null +++ b/website/public/groupAdmin.php @@ -0,0 +1,46 @@ + + + + + + + + +getClass(); + $alertMessage = $w->getMessage(); + } +} + +/* Add your view files here. */ +include("../views/groupAdmin.php"); + +/* This adds the footer. */ +include("../views/footer.php"); +?> + + diff --git a/website/queries/createGroup.php b/website/queries/createGroup.php new file mode 100644 index 0000000..20ee28b --- /dev/null +++ b/website/queries/createGroup.php @@ -0,0 +1,37 @@ +bindValue(':name', test_input($_POST["groupName"]), PDO::PARAM_STR); + $createGroup->bindValue(':description', test_input($_POST["bio"])); + $createGroup->execute(); + + $getGroupID = prepareQuery(" + SELECT + `groupID` + FROM + `group_page` + WHERE + `name` LIKE :name"); + $getGroupID->bindValue(':name', test_input($_POST["groupName"]), PDO::PARAM_STR); + $getGroupID->execute(); + $groupID = $getGroupID->fetch()["groupID"]; + + $makeUserAdmin = prepareQuery(" + INSERT INTO + `group_member` (userID, groupID, role) + VALUES (:userID, :groupID, 'admin') + "); + $makeUserAdmin->bindValue(":userID", $_SESSION["userID"]); + $makeUserAdmin->bindValue("groupID", $groupID); + $makeUserAdmin->execute(); + + updateAvatar($groupID); +} \ No newline at end of file diff --git a/website/queries/groupAdmin.php b/website/queries/groupAdmin.php new file mode 100644 index 0000000..ae2abd3 --- /dev/null +++ b/website/queries/groupAdmin.php @@ -0,0 +1,61 @@ +bindParam(":groupID", $groupID); + $stmt->execute(); + return $stmt->fetch(); +} + +function updateGroupSettings(int $groupID) +{ + if (!checkGroupAdmin($groupID, $_SESSION["userID"])) { + throw new AngryAlert("Je hebt geen rechten in deze groep"); + } + $stmt = prepareQuery(" + UPDATE + `group_page` + SET + `name` = :name, + `description` = :bio + WHERE + `groupID` = :groupID + "); + $stmt->bindValue(":bio", test_input($_POST["bio"])); + $stmt->bindValue(":name", test_input($_POST["name"])); + $stmt->bindValue(":groupID", test_input($_POST["groupID"])); + $stmt->execute(); + if ($stmt->rowCount()) { + throw new HappyAlert("Groep aangepast!"); + } else { + throw new AngryAlert("Er is iets mis gegaan"); + } +} + +function checkGroupAdmin(int $groupID, int $userID) : bool { + $stmt = prepareQuery(" + SELECT + `role` + FROM + `group_member` + WHERE + `groupID` = :groupID AND + `userID` = :userID + "); + $stmt->bindValue(":userID", $userID); + $stmt->bindValue(":groupID", $groupID); + $stmt->execute(); + if (!$stmt->rowCount()) { + return false; + } + $role = $stmt->fetch()["role"]; + return ($role == "admin"); +} \ No newline at end of file diff --git a/website/queries/picture.php b/website/queries/picture.php index 8e99d9a..ba27f72 100644 --- a/website/queries/picture.php +++ b/website/queries/picture.php @@ -6,7 +6,7 @@ * @throws AngryAlert * @throws HappyAlert */ -function updateAvatar(bool $group = false) { +function updateAvatar(int $group = 0) { $publicDir = "/var/www/html/public/"; $tmpImg = $_FILES["pp"]["tmp_name"]; $avatarDir = $group ? "uploads/groupavatar/" : "uploads/profilepictures/"; @@ -16,17 +16,17 @@ function updateAvatar(bool $group = false) { if ($_FILES["pp"]["size"] > 4000000) { throw new AngryAlert("Bestand is te groot, maximaal 4MB toegestaan."); } - $relativePath = $avatarDir . $_SESSION["userID"] . "_avatar.gif"; - $group ? removeOldGroupAvatar($_POST["groupID"]) : removeOldUserAvatar(); + $relativePath = $group ? $avatarDir . $group . "_avatar.gif" : $avatarDir . $_SESSION["userID"] . "_avatar.gif"; + $group ? removeOldGroupAvatar($group) : removeOldUserAvatar(); move_uploaded_file($tmpImg, $publicDir . $relativePath); } else { - $relativePath = $avatarDir . $_SESSION["userID"] . "_avatar.png"; + $relativePath = $group ? $avatarDir . $group . "_avatar.png": $avatarDir . $_SESSION["userID"] . "_avatar.png"; $scaledImg = scaleAvatar($tmpImg); - $group ? removeOldGroupAvatar($_POST["groupID"]) : removeOldUserAvatar(); + $group ? removeOldGroupAvatar($group) : removeOldUserAvatar(); imagepng($scaledImg, $publicDir . $relativePath); } - $group ? setGroupAvatarToDatabase("../" . $relativePath, $_POST["groupID"]) : setUserAvatarToDatabase("../" . $relativePath); + $group ? setGroupAvatarToDatabase("../" . $relativePath, $group) : setUserAvatarToDatabase("../" . $relativePath); throw new HappyAlert("Profielfoto veranderd."); } diff --git a/website/views/createGroup.php b/website/views/createGroup.php new file mode 100644 index 0000000..736fc45 --- /dev/null +++ b/website/views/createGroup.php @@ -0,0 +1,42 @@ + + +
    +
    +
    +
    Maak een groep!
    +
      +
    • + + +
      • +
    • + + +
      • +
    • + + +
      • +
    • + + +
      • +
    +
    +
    +
    diff --git a/website/views/groupAdmin.php b/website/views/groupAdmin.php new file mode 100644 index 0000000..66b38f5 --- /dev/null +++ b/website/views/groupAdmin.php @@ -0,0 +1,77 @@ + +
    +
    + +
    + +
    + +
    +
    Groep Instellingen
    + "> +
      +
    • + + " + > +
      • +
    • + + + +
      • +
    • + + +
      • +
    +
    +
    +
    Verander groepsafbeelding.
    + "> +
      +
    • + + " + class="group-picture" + > +
      • +
    • + + +
      • +
    • + + +
      • +
    +
    +
    +
    \ No newline at end of file diff --git a/website/views/menu.php b/website/views/menu.php index dab8fce..03e0f56 100644 --- a/website/views/menu.php +++ b/website/views/menu.php @@ -14,7 +14,7 @@
    • - + Maak een groep aan
      • From 9165f8fa1b326928174f5faead81ecbc91558606 Mon Sep 17 00:00:00 2001 From: Marijn Jansen Date: Thu, 2 Feb 2017 16:18:15 +0100 Subject: [PATCH 29/37] Check if file had been uploaded. --- website/queries/picture.php | 3 +++ website/views/groupAdmin.php | 1 + 2 files changed, 4 insertions(+) diff --git a/website/queries/picture.php b/website/queries/picture.php index ba27f72..9c92540 100644 --- a/website/queries/picture.php +++ b/website/queries/picture.php @@ -7,6 +7,9 @@ * @throws HappyAlert */ function updateAvatar(int $group = 0) { + if (!array_key_exists("pp", $_FILES)) { + throw new AngryAlert("Geen afbeelding meegegeven!"); + } $publicDir = "/var/www/html/public/"; $tmpImg = $_FILES["pp"]["tmp_name"]; $avatarDir = $group ? "uploads/groupavatar/" : "uploads/profilepictures/"; diff --git a/website/views/groupAdmin.php b/website/views/groupAdmin.php index 66b38f5..aab4eea 100644 --- a/website/views/groupAdmin.php +++ b/website/views/groupAdmin.php @@ -62,6 +62,7 @@ $groupinfo = getGroupSettings($_GET["groupID"]); name="pp" accept="image/*" size="4000000" + required >
    • From f8c9454b85a2e85961e9421555f8c0d7054f3b3c Mon Sep 17 00:00:00 2001 From: Lars van Hijfte Date: Thu, 2 Feb 2017 17:43:32 +0100 Subject: [PATCH 30/37] empty SessionID sends the user to login page If the session is empty, it now sends you to the login page with a safed url so it can revert you back to the right page after login --- website/public/API/deletePost.php | 8 ++++---- website/public/API/postComment.php | 8 ++++---- website/public/API/postPost.php | 7 ++++--- website/public/API/sendMessage.php | 7 ++++--- website/public/js/chat.js | 2 ++ website/public/js/main.js | 5 ++--- website/public/js/masonry.js | 10 +++++++++- website/public/js/post.js | 4 ++++ website/public/styles/post-popup.css | 2 +- website/views/head.php | 4 ++-- website/views/post-view.php | 17 ++++++++--------- 11 files changed, 44 insertions(+), 30 deletions(-) diff --git a/website/public/API/deletePost.php b/website/public/API/deletePost.php index fffadf5..37f89a1 100644 --- a/website/public/API/deletePost.php +++ b/website/public/API/deletePost.php @@ -3,10 +3,10 @@ session_start(); require_once "../../queries/post.php"; require_once "../../queries/user.php"; - -if (isset($_SESSION["userID"]) and - getRoleByID($_SESSION["userID"]) != 'frozen' and - getRoleByID($_SESSION["userID"]) != 'banned') { +if (!isset($_SESSION["userID"])) { + echo "logged out"; +} else if (getRoleByID($_SESSION["userID"]) != 'frozen' and + getRoleByID($_SESSION["userID"]) != 'banned') { if (empty($_POST["postID"]) or empty($_SESSION["userID"])) { header('HTTP/1.1 500 Non enough arguments'); diff --git a/website/public/API/postComment.php b/website/public/API/postComment.php index 3864cc8..c9f8a53 100644 --- a/website/public/API/postComment.php +++ b/website/public/API/postComment.php @@ -7,10 +7,10 @@ require_once("../../queries/connect.php"); require_once("../../queries/checkInput.php"); require_once("../../queries/user.php"); - -if (isset($_SESSION["userID"]) && - getRoleByID($_SESSION["userID"]) != 'frozen' && - getRoleByID($_SESSION["userID"]) != 'banned') { +if (!isset($_SESSION["userID"])) { + echo "logged out"; +} else if (getRoleByID($_SESSION["userID"]) != 'frozen' && + getRoleByID($_SESSION["userID"]) != 'banned') { if ($_POST['button'] == 'reaction') { if (empty($_POST['newcomment-content'])) { echo 0; diff --git a/website/public/API/postPost.php b/website/public/API/postPost.php index 241bda6..2d703d3 100644 --- a/website/public/API/postPost.php +++ b/website/public/API/postPost.php @@ -8,9 +8,10 @@ require_once("../../queries/connect.php"); require_once("../../queries/checkInput.php"); require_once("../../queries/user.php"); -if (isset($_SESSION["userID"]) && - getRoleByID($_SESSION["userID"]) != 'frozen' && - getRoleByID($_SESSION["userID"]) != 'banned') { +if (!isset($_SESSION["userID"])) { + echo "logged out"; +} else if (getRoleByID($_SESSION["userID"]) != 'frozen' && + getRoleByID($_SESSION["userID"]) != 'banned') { if (empty($_SESSION["userID"])) { header('HTTP/1.1 500 Non enough arguments'); diff --git a/website/public/API/sendMessage.php b/website/public/API/sendMessage.php index c6e3231..a2d411b 100644 --- a/website/public/API/sendMessage.php +++ b/website/public/API/sendMessage.php @@ -7,9 +7,10 @@ require_once("../../queries/checkInput.php"); require_once("../../queries/user.php"); // Check if the user is allowed to send a message. -if (isset($_SESSION["userID"]) && - getRoleByID($_SESSION["userID"]) != 'frozen' && - getRoleByID($_SESSION["userID"]) != 'banned') { +if (!isset($_SESSION["userID"])) { + echo "logged out"; +} else if (getRoleByID($_SESSION["userID"]) != 'frozen' && + getRoleByID($_SESSION["userID"]) != 'banned') { if (!empty(test_input($_POST["destination"])) && !empty(test_input($_POST["content"])) ) { diff --git a/website/public/js/chat.js b/website/public/js/chat.js index a3ff430..f431b91 100644 --- a/website/public/js/chat.js +++ b/website/public/js/chat.js @@ -43,6 +43,8 @@ function sendMessage() { ).done(function(response) { if (response == "frozen") { alert("Je account is bevroren, dus je kan niet chat berichten versturen. Contacteer een admin als je denkt dat dit onjuist is."); + } else if (response == "logged out") { + window.location.href = "login.php?url=" + window.location.pathname; } // Load messages if the message has been send, so it shows in the chat. loadMessages(); diff --git a/website/public/js/main.js b/website/public/js/main.js index 30cd3ed..2ce58e4 100644 --- a/website/public/js/main.js +++ b/website/public/js/main.js @@ -3,8 +3,7 @@ var months = ["januari", "februari", "maart", "april", "mei", "juni", "juli", "a function fancyText(text) { // Add links, images, gifs and (youtube) video's. - var regex = /(https?:\/\/.[^ <>"]*)/ig; - text = text.replace(regex, function(link) { + text = text.replace(/(https?:\/\/.[^ \n<>"]*)/ig, function(link) { // Add images if (link.match(/(https?:\/\/.[^ ]*\.(?:png|jpg|jpeg|gif))/ig)) { return "" + link + ""; @@ -39,7 +38,7 @@ function fancyText(text) { } // This function gets the value of a cookie when given a key. -// If didn´t find any compatible cookie, it returns false. +// If it didn´t find any compatible cookie, it returns false. function getCookie(key) { cookies = document.cookie.split("; "); for (var i in cookies) { diff --git a/website/public/js/masonry.js b/website/public/js/masonry.js index a628e96..d43577b 100644 --- a/website/public/js/masonry.js +++ b/website/public/js/masonry.js @@ -26,7 +26,7 @@ function requestPost(postID) { function postPost() { title = $("input.newpost[name='title']").val(); content = $("textarea.newpost[name='content']").val(); - + console.log(masonryMode); if (masonryMode == 2) { $.post("API/postPost.php", { title: title, content : content, @@ -36,6 +36,10 @@ function postPost() { $('#alertbox').show(); $('#alerttext').html("Geen titel of inhoud; vul a.u.b. in."); window.scrollTo(0,0); + } else if (data == "logged out") { + window.location.href = "login.php?url=" + window.location.pathname; + } else if (data == "frozen") { + alert("Je account is bevroren, dus je kan geen posts plaatsen. Contacteer een admin als je denkt dat dit onjuist is."); } else { $('#alertbox').hide(); masonry(masonryMode); @@ -49,6 +53,10 @@ function postPost() { $('#alertbox').show(); $('#alerttext').html("Geen titel of inhoud; vul a.u.b. in."); window.scrollTo(0,0); + } else if (data == "logged out") { + window.location.href = "login.php?url=" + window.location.pathname; + } else if (data == "frozen") { + alert("Je account is bevroren, dus je kan geen posts plaatsen. Contacteer een admin als je denkt dat dit onjuist is."); } else { $('#alertbox').hide(); masonry(masonryMode); diff --git a/website/public/js/post.js b/website/public/js/post.js index 4009023..4f77d4d 100644 --- a/website/public/js/post.js +++ b/website/public/js/post.js @@ -8,6 +8,8 @@ function postComment(buttonValue) { ).done(function (response) { if (response == "frozen") { alert("Je account is bevroren, dus je kan geen comments plaatsen of \"niet slechten\". Contacteer een admin als je denkt dat dit onjuist is."); + } else if (response == "logged out") { + window.location.href = "login.php?url=" + window.location.pathname; } }); @@ -30,6 +32,8 @@ function deletePost(postID) { ).done(function (response) { if (response == "frozen") { alert("Je account is bevroren, dus je kan geen posts verwijderen. Contacteer een admin als je denkt dat dit onjuist is."); + } else if (response == "logged out") { + window.location.href = "login.php?url=" + window.location.pathname; } }); closeModal(); diff --git a/website/public/styles/post-popup.css b/website/public/styles/post-popup.css index 24badcb..9493b83 100644 --- a/website/public/styles/post-popup.css +++ b/website/public/styles/post-popup.css @@ -91,7 +91,7 @@ .deleteButton { background-color: firebrick; - + float: right; } .deleteButton i { diff --git a/website/views/head.php b/website/views/head.php index f831f5d..52bcab8 100644 --- a/website/views/head.php +++ b/website/views/head.php @@ -26,8 +26,8 @@ require_once ("../queries/user.php"); session_start(); -if(!isset($_SESSION["userID"])){ - header("location:login.php"); +if(!isset($_SESSION["userID"])) { + header("location:login.php?url=" . "$_SERVER[REQUEST_URI]"); } else { updateLastActivity(); } diff --git a/website/views/post-view.php b/website/views/post-view.php index f8fe902..717e6a8 100644 --- a/website/views/post-view.php +++ b/website/views/post-view.php @@ -5,14 +5,6 @@ $fullname = $post['fname'] . " " . $post['lname'] . " (" . $post['username'] . " ?>

      - -
      - gepost door , '> @@ -20,7 +12,14 @@ $fullname = $post['fname'] . " " . $post['lname'] . " (" . $post['username'] . "
      - + +
      +

      From b206d243b905ad614f2542bb582d06fa1369ff58 Mon Sep 17 00:00:00 2001 From: Lars van Hijfte Date: Thu, 2 Feb 2017 18:17:58 +0100 Subject: [PATCH 31/37] Validator fixes Changes chat, profile and settings pages so it is compatible with the validator of w3 --- website/public/styles/main.css | 2 -- website/public/styles/profile.css | 1 - website/views/group.php | 2 +- website/views/header.php | 4 ++-- website/views/profile.php | 26 ++++++++++++-------------- website/views/settings-view.php | 8 ++++---- 6 files changed, 19 insertions(+), 24 deletions(-) diff --git a/website/public/styles/main.css b/website/public/styles/main.css index 650a30f..5bb7b1d 100644 --- a/website/public/styles/main.css +++ b/website/public/styles/main.css @@ -256,8 +256,6 @@ div[data-title]:hover:after { top: 150%; z-index: 200; white-space: nowrap; - -moz-border-radius: 3px; - -webkit-border-radius: 3px; border-radius: 3px; box-shadow: 0 14px 28px rgba(0,0,0,0.25), 0 10px 10px rgba(0,0,0,0.22); background-color: #333; diff --git a/website/public/styles/profile.css b/website/public/styles/profile.css index 27ff7fd..2f857a4 100644 --- a/website/public/styles/profile.css +++ b/website/public/styles/profile.css @@ -71,7 +71,6 @@ .group-picture { border: none; - margin-right: 15px; } diff --git a/website/views/group.php b/website/views/group.php index b27f18c..250fc9f 100644 --- a/website/views/group.php +++ b/website/views/group.php @@ -1,6 +1,6 @@
      - ">
      + <?= $group[" class="group-picture main-picture" src="">
      diff --git a/website/views/header.php b/website/views/header.php index c1379fc..e13eca6 100644 --- a/website/views/header.php +++ b/website/views/header.php @@ -23,9 +23,9 @@ $userinfo = getHeaderInfo();
      Hallo
      - +
      - "/> + <?= $userinfo[" id="own-profile-picture" class="profile-picture" src=""/>
      diff --git a/website/views/profile.php b/website/views/profile.php index 4139099..62157f4 100644 --- a/website/views/profile.php +++ b/website/views/profile.php @@ -4,7 +4,7 @@
      - " src="">
      + <?= $user[" class="profile-picture main-picture " src="">
    • - - - - format("Y"); for ($year = $now; $year >= 1900; $year--): ?> From 74145d5d1c808b5c37a0646d27804aaa6e9c386c Mon Sep 17 00:00:00 2001 From: Marijn Jansen Date: Thu, 2 Feb 2017 19:43:57 +0100 Subject: [PATCH 32/37] Updated buttons on groups --- website/public/js/groupButtons.js | 36 ++++++++++++++++++---------- website/public/styles/post-popup.css | 1 - website/public/styles/profile.css | 21 +++++++++++++++- website/views/groupAdmin.php | 27 +++++++++++++++++---- 4 files changed, 66 insertions(+), 19 deletions(-) diff --git a/website/public/js/groupButtons.js b/website/public/js/groupButtons.js index e6ada67..549277d 100644 --- a/website/public/js/groupButtons.js +++ b/website/public/js/groupButtons.js @@ -3,31 +3,41 @@ function placeGroupButtons() { .done(function(data) { var $buttonContainer = $("div.group-button-container"); - if(data == 'none') { + if (data == 'none') { $buttonContainer.append( - ""); - } else if(data == 'request') { + } else if (data == 'request') { $buttonContainer.append( - ""); + } else if (data == 'admin') { + $buttonContainer.append( + "" + ); } else { $buttonContainer.append( - ""); } $buttonContainer.children().click(function() { - $.post("API/editMembership.php", { grp: groupID, role: this.value }) - .done(function() { - $buttonContainer.children().remove(); - placeGroupButtons(); - updateMenus(); - }).fail(function() { - }); + if (this.value == 'admin') { + window.location.href='groupAdmin.php?groupID=' + groupID; + } else { + $.post("API/editMembership.php", {grp: groupID, role: this.value}) + .done(function () { + $buttonContainer.children().remove(); + placeGroupButtons(); + updateMenus(); + }).fail(function () { + }); + } }); }); diff --git a/website/public/styles/post-popup.css b/website/public/styles/post-popup.css index 24badcb..541b52c 100644 --- a/website/public/styles/post-popup.css +++ b/website/public/styles/post-popup.css @@ -91,7 +91,6 @@ .deleteButton { background-color: firebrick; - } .deleteButton i { diff --git a/website/public/styles/profile.css b/website/public/styles/profile.css index 27ff7fd..f6e545e 100644 --- a/website/public/styles/profile.css +++ b/website/public/styles/profile.css @@ -31,11 +31,14 @@ display: block; margin: 7px 0; - width: 200px; font-size: 18px; } +.friend-button-container button, .status-buttons-container button, .group-button-fixed { + width: 200px; +} + .group-button-container button { float: right; } @@ -74,6 +77,22 @@ margin-right: 15px; } +.group-button-fancy span { + display: none; +} + +.group-button-fancy:hover { + text-align: right; +} + +.group-button-fancy i { + display: inline-block; +} + +.group-button-fancy:hover span { + display: inline-block; + margin-right: 5px; +} /* Old */ diff --git a/website/views/groupAdmin.php b/website/views/groupAdmin.php index aab4eea..a28553e 100644 --- a/website/views/groupAdmin.php +++ b/website/views/groupAdmin.php @@ -7,10 +7,20 @@ $groupinfo = getGroupSettings($_GET["groupID"]);
      -
      - -
      +
      + +
      +
      + +
      Groep Instellingen
      "> @@ -70,9 +80,18 @@ $groupinfo = getGroupSettings($_GET["groupID"]); + class="fa fa-picture-o" + > Verander profielfoto
    +
    + +
    \ No newline at end of file From 74e91ed7cb18acebaabd5b6356f87aec25830977 Mon Sep 17 00:00:00 2001 From: Marijn Jansen Date: Thu, 2 Feb 2017 21:14:25 +0100 Subject: [PATCH 33/37] Add mods/admin to a group. --- website/public/groupAdmin.php | 27 ++++++++++++++----- website/queries/groupAdmin.php | 48 ++++++++++++++++++++++++++++++++++ website/queries/settings.php | 15 +++++++++++ website/views/groupAdmin.php | 29 ++++++++++++++++++++ 4 files changed, 113 insertions(+), 6 deletions(-) diff --git a/website/public/groupAdmin.php b/website/public/groupAdmin.php index 13ff7e0..6095149 100644 --- a/website/public/groupAdmin.php +++ b/website/public/groupAdmin.php @@ -23,12 +23,27 @@ $alertClass; $alertMessage; if ($_SERVER["REQUEST_METHOD"] == "POST") { try { - if ($_POST["form"] == "group") { - updateGroupSettings($_POST["groupID"]); - } else if ($_POST["form"] == "picture") { - if (checkGroupAdmin($_POST["groupID"], $_SESSION["userID"])) { - updateAvatar($_POST["groupID"]); - } + switch ($_POST["form"]) { + case "group": + updateGroupSettings($_POST["groupID"]); + break; + case "picture": + if (checkGroupAdmin($_POST["groupID"], $_SESSION["userID"])) { + updateAvatar($_POST["groupID"]); + } + break; + case "mod": + if (!array_key_exists("userID", $_POST)) { + throw new AngryAlert("Geen gebruiker geselecteerd."); + } + upgradeUser($_POST["groupID"], $_POST["userID"], "mod"); + break; + case "admin": + if (!array_key_exists("userID", $_POST)) { + throw new AngryAlert("Geen gebruiker geselecteerd."); + } + upgradeUser($_POST["groupID"], $_POST["userID"], "admin"); + break; } } catch (AlertMessage $w) { $alertClass = $w->getClass(); diff --git a/website/queries/groupAdmin.php b/website/queries/groupAdmin.php index ae2abd3..e3580b6 100644 --- a/website/queries/groupAdmin.php +++ b/website/queries/groupAdmin.php @@ -58,4 +58,52 @@ function checkGroupAdmin(int $groupID, int $userID) : bool { } $role = $stmt->fetch()["role"]; return ($role == "admin"); +} + +function getAllGroupMembers(int $groupID) { + $stmt = prepareQuery(" + SELECT + `username`, + `user`.`userID`, + CONCAT(`fname`, ' ', `lname`) AS `fullname`, + `group_member`.`role` + FROM + `group_member` + LEFT JOIN + `user` + ON + `group_member`.`userID` = `user`.`userID` + WHERE + `groupID` = :groupID AND `group_member`.`role` = 'member' + "); + + $stmt->bindParam(':groupID', $groupID); + if (!$stmt->execute()) { + return False; + } + return $stmt->fetchAll(); +} + +function upgradeUser(int $groupID, int $userID, string $role) { + if (!checkGroupAdmin($groupID, $_SESSION["userID"])) { + throw new AngryAlert("Geen toestemming om te wijzigen"); + } + + $stmt = prepareQuery(" + UPDATE + `group_member` + SET + `role` = :role + WHERE + `userID` = :userID AND `groupID` = :groupID + "); + $stmt->bindValue(":groupID", $groupID); + $stmt->bindValue(":userID", $userID); + $stmt->bindValue(":role", $role); + $stmt->execute(); + if ($stmt->rowCount()) { + throw new HappyAlert("Permissie aangepast!"); + } else { + throw new AngryAlert("Er is iets mis gegaan"); + } } \ No newline at end of file diff --git a/website/queries/settings.php b/website/queries/settings.php index 9b17d17..26237ec 100644 --- a/website/queries/settings.php +++ b/website/queries/settings.php @@ -148,6 +148,10 @@ function doChangePassword() { } } +/** + * Changes the users email if it is valid. + * @throws AngryAlert + */ function changeEmail() { if (test_input($_POST["email"]) == test_input($_POST["email-confirm"])) { @@ -164,6 +168,11 @@ function changeEmail() { } } +/** + * Checks if an emailadres is available in the database. + * @param $email + * @throws AngryAlert + */ function emailIsAvailableInDatabase($email) { $stmt = prepareQuery(" SELECT @@ -181,6 +190,12 @@ function emailIsAvailableInDatabase($email) { } } +/** + * Does the actual changing of an email-adress. + * @param $email + * @throws AngryAlert + * @throws HappyAlert + */ function doChangeEmail($email) { $stmt = prepareQuery(" UPDATE diff --git a/website/views/groupAdmin.php b/website/views/groupAdmin.php index a28553e..54fbee8 100644 --- a/website/views/groupAdmin.php +++ b/website/views/groupAdmin.php @@ -85,6 +85,35 @@ $groupinfo = getGroupSettings($_GET["groupID"]); +
    +
    Voeg een admin/mod toe
    +
      + + " type="hidden"> + + + + + +
    +
    • From 7e4107ac8b357bc1335c9657293182a5ce18720c Mon Sep 17 00:00:00 2001 From: Lars van Hijfte Date: Fri, 3 Feb 2017 00:13:23 +0100 Subject: [PATCH 34/37] Added fancy buttons in profile --- website/public/js/friendButtons.js | 28 +++++++++++++++------------- website/public/js/groupButtons.js | 12 ++++++------ website/public/styles/post-popup.css | 12 ------------ website/public/styles/profile.css | 19 ++++++++++++------- website/views/post-view.php | 4 ++-- website/views/profile.php | 14 ++++++++++---- 6 files changed, 45 insertions(+), 44 deletions(-) diff --git a/website/public/js/friendButtons.js b/website/public/js/friendButtons.js index 47c476a..303ccf9 100644 --- a/website/public/js/friendButtons.js +++ b/website/public/js/friendButtons.js @@ -19,24 +19,24 @@ function placeFriendButtons() { case "0": value1 = "request"; class1 = "green"; - text1 = "Bevriend"; - icon1 = "fa-handshake-o"; + text1 = "Word vrienden"; + icon1 = "fa-user-plus"; break; case "1": value1 = userID; class1 = "green"; text1 = "Chat"; - icon1 = "fa-comment-o"; + icon1 = "fa-comment"; value2 = "delete"; class2 = "red"; - text2 = "Verwijder"; - icon2 = "fa-times"; + text2 = "Ontvriend"; + icon2 = "fa-user-times"; break; case "2": value1 = "delete"; class1 = "red"; text1 = "Trek verzoek in"; - icon1 = "fa-cross"; + icon1 = "fa-times"; break; case "3": value1 = "accept"; @@ -51,16 +51,18 @@ function placeFriendButtons() { } $buttonContainer.append( - ""); + "
      "); $buttonContainer.append( - ""); + "
      "); - $buttonContainer.children().click(function() { + $buttonContainer.find("button").click(function() { if (isNaN(this.value)) editFriendship(userID, this.value); else if (this.value != "") diff --git a/website/public/js/groupButtons.js b/website/public/js/groupButtons.js index 549277d..caf3ab8 100644 --- a/website/public/js/groupButtons.js +++ b/website/public/js/groupButtons.js @@ -5,23 +5,23 @@ function placeGroupButtons() { if (data == 'none') { $buttonContainer.append( - ""); } else if (data == 'request') { $buttonContainer.append( - ""); } else if (data == 'admin') { $buttonContainer.append( - "" ); } else { $buttonContainer.append( - ""); } diff --git a/website/public/styles/post-popup.css b/website/public/styles/post-popup.css index 9493b83..e82129b 100644 --- a/website/public/styles/post-popup.css +++ b/website/public/styles/post-popup.css @@ -92,16 +92,4 @@ .deleteButton { background-color: firebrick; float: right; -} - -.deleteButton i { - display: inline-block; -} - -.deleteButton:hover span { - display: inline-block; -} - -.deleteButton span { - display: none; } \ No newline at end of file diff --git a/website/public/styles/profile.css b/website/public/styles/profile.css index 18e105e..8a93d12 100644 --- a/website/public/styles/profile.css +++ b/website/public/styles/profile.css @@ -27,16 +27,21 @@ display: inline-block; } +.friend-button-container div, .status-buttons-container div { + width: 200px; + display: inline-block; +} + .friend-button-container button, .status-buttons-container button, .group-button-container button { display: block; + float: right; margin: 7px 0; font-size: 18px; } - -.friend-button-container button, .status-buttons-container button, .group-button-fixed { - width: 200px; +.status-buttons-container button { + float: left; } .group-button-container button { @@ -76,19 +81,19 @@ border: none; } -.group-button-fancy span { +.fancy-button span { display: none; } -.group-button-fancy:hover { +.fancy-button:hover { text-align: right; } -.group-button-fancy i { +.fancy-button i { display: inline-block; } -.group-button-fancy:hover span { +.fancy-button:hover span { display: inline-block; margin-right: 5px; } diff --git a/website/views/post-view.php b/website/views/post-view.php index 717e6a8..fadc791 100644 --- a/website/views/post-view.php +++ b/website/views/post-view.php @@ -13,11 +13,11 @@ $fullname = $post['fname'] . " " . $post['lname'] . " (" . $post['username'] . "
    -
    diff --git a/website/views/profile.php b/website/views/profile.php index 62157f4..0cb5cc2 100644 --- a/website/views/profile.php +++ b/website/views/profile.php @@ -7,10 +7,16 @@ <?= $user[" class="profile-picture main-picture " src="">
    - - +
    + +
    +
    + +

    :)

    From 6d739a4480019709d6abe9addea37ade0ebbc34d Mon Sep 17 00:00:00 2001 From: Lars van Hijfte Date: Fri, 3 Feb 2017 00:24:38 +0100 Subject: [PATCH 35/37] Chat is now only loading the last 100 messages --- website/queries/private_message.php | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/website/queries/private_message.php b/website/queries/private_message.php index 3b88563..f2df887 100644 --- a/website/queries/private_message.php +++ b/website/queries/private_message.php @@ -6,18 +6,23 @@ function getOldChatMessages($user2ID) { if (getFriendshipStatus($user2ID) == 1) { $stmt = prepareQuery(" SELECT - * + * FROM - `private_message` - WHERE - `origin` = :user1 AND - `destination` = :user2 OR - `origin` = :user2 AND - `destination` = :user1 + (SELECT + * + FROM + `private_message` + WHERE + `origin` = :user1 AND + `destination` = :user2 OR + `origin` = :user2 AND + `destination` = :user1 + ORDER BY + `messageID` DESC + LIMIT + 100) sub ORDER BY - `creationdate` ASC - LIMIT - 100 + `messageID` ASC "); $stmt->bindParam(":user1", $user1ID); @@ -76,7 +81,7 @@ function getNewChatMessages($lastID, $destination) { `destination` = :user1) AND `messageID` > :lastID ORDER BY - `creationdate` ASC + `messageID` ASC "); $stmt->bindParam(':user1', $_SESSION["userID"]); From 02349dbe2846597ee77772bfef19eeb454455419 Mon Sep 17 00:00:00 2001 From: Lars van Hijfte Date: Fri, 3 Feb 2017 10:30:44 +0100 Subject: [PATCH 36/37] Changed description --- website/public/js/friendButtons.js | 4 ++-- website/views/head.php | 2 +- website/views/login_head.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/website/public/js/friendButtons.js b/website/public/js/friendButtons.js index 303ccf9..87222e9 100644 --- a/website/public/js/friendButtons.js +++ b/website/public/js/friendButtons.js @@ -53,12 +53,12 @@ function placeFriendButtons() { $buttonContainer.append( "
    "); $buttonContainer.append( "
    "); diff --git a/website/views/head.php b/website/views/head.php index 52bcab8..3ec8a79 100644 --- a/website/views/head.php +++ b/website/views/head.php @@ -1,5 +1,5 @@ - + MyHyvesbook+ diff --git a/website/views/login_head.php b/website/views/login_head.php index b4b2724..9e580df 100644 --- a/website/views/login_head.php +++ b/website/views/login_head.php @@ -1,6 +1,6 @@ - + MyHyvesbook+ From ecd24ef442190bfbc986266f411a440d4a5f9274 Mon Sep 17 00:00:00 2001 From: Lars van Hijfte Date: Fri, 3 Feb 2017 10:34:07 +0100 Subject: [PATCH 37/37] Revert "Merge branch 'joey-testing' into 'master'" This reverts merge request !196 --- website/views/homeLoginRegister.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/website/views/homeLoginRegister.php b/website/views/homeLoginRegister.php index 24fa266..ad7be40 100644 --- a/website/views/homeLoginRegister.php +++ b/website/views/homeLoginRegister.php @@ -29,12 +29,13 @@ $user = $psw = $remember =""; $loginErr = $resetErr = $fbRegisterErr =""; if ($_SERVER["REQUEST_METHOD"] == "POST") { + $url = $_POST["url"]; // Checks for which button is pressed switch ($_POST["submit"]) { case "login": try { $user = ($_POST["user"]); - validateLogin($_POST["user"], $_POST["psw"], $_POST["url"];); + validateLogin($_POST["user"], $_POST["psw"], $url); } catch(loginException $e) { $loginErr = $e->getMessage(); }