Changed admin checkbox buttons

Lars

See merge request !206

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"])) {
-if (isset($_SESSION["userID"]) and
+    echo "logged out";
-    getRoleByID($_SESSION["userID"]) != 'frozen' and
+} else if (getRoleByID($_SESSION["userID"]) != 'frozen' and
-    getRoleByID($_SESSION["userID"]) != 'banned') {
+           getRoleByID($_SESSION["userID"]) != 'banned') {
 
     if (empty($_POST["postID"]) or empty($_SESSION["userID"])) {
         header('HTTP/1.1 500 Non enough arguments');

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();

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') {

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"])) {

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 {

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"]));

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"])) {
-if (isset($_SESSION["userID"]) &&
+    echo "logged out";
-    getRoleByID($_SESSION["userID"]) != 'frozen' &&
+} else if (getRoleByID($_SESSION["userID"]) != 'frozen' &&
-    getRoleByID($_SESSION["userID"]) != 'banned') {
+           getRoleByID($_SESSION["userID"]) != 'banned') {
     if ($_POST['button'] == 'reaction') {
         if (empty($_POST['newcomment-content'])) {
             echo 0;

website/public/API/postPost.php

@@ -8,40 +8,44 @@ require_once("../../queries/connect.php");
 require_once("../../queries/checkInput.php");
 require_once("../../queries/user.php");
 
-if (isset($_SESSION["userID"]) &&
+if (!isset($_SESSION["userID"])) {
-    getRoleByID($_SESSION["userID"]) != 'frozen' &&
+    echo "logged out";
-    getRoleByID($_SESSION["userID"]) != 'banned') {
+} else if (getRoleByID($_SESSION["userID"]) != 'frozen' &&
+           getRoleByID($_SESSION["userID"]) != 'banned') {
 
-    if (empty($_POST["title"]) or
+    if (empty($_SESSION["userID"])) {
-        empty($_POST["content"]) or
-        empty($_SESSION["userID"])
-    ) {
         header('HTTP/1.1 500 Non enough arguments');
     }
 
-    if (empty($_POST["group"])) {
+    if (empty(test_input($_POST["title"])) or
-        // User Post
+        empty(test_input($_POST["content"]))
-        makePost(
+    ) {
-            $_SESSION["userID"],
+        echo "empty";
-            null,
-            test_input($_POST["title"]),
-            test_input($_POST["content"])
-        );
     } 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.
+            // Check if the user is an admin or mod of the group.
-        if (!in_array(selectGroupRole($_POST["group"]), array('mod', 'admin'))) {
+            if (!in_array(selectGroupRole($_POST["group"]), array('mod', 'admin'))) {
-            header('HTTP/1.1 500 Non enough rights');
+                header('HTTP/1.1 500 Non enough rights');
-            return;
+                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";

website/public/API/searchPageNumber.php

@@ -6,11 +6,11 @@ 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");
 
 if (isset($_SESSION["userID"]) &&
-    getRoleByID($_SESSION["userID"]) != 'banned') {
+    getRoleByID($_SESSION["userID"]) != 'banned') {$user_perpage = $group_perpage = 20;
-
-    $user_perpage = $group_perpage = 20;
 
     $user_currentpage = $group_currentpage = 1;
     if (isset($_POST['user-pageselect'])) {
@@ -28,20 +28,26 @@ if (isset($_SESSION["userID"]) &&
         $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']);
     }
 
-    include("../../views/searchPageNumber.php");
+    include ("../../views/searchPageNumber.php");
 } else {
     header('HTTP/1.0 403 Forbidden');
 }

website/public/API/sendMessage.php

@@ -6,12 +6,16 @@ require_once("../../queries/private_message.php");
 require_once("../../queries/checkInput.php");
 require_once("../../queries/user.php");
 
-if (isset($_SESSION["userID"]) &&
+// Check if the user is allowed to send a message.
-    getRoleByID($_SESSION["userID"]) != 'frozen' &&
+if (!isset($_SESSION["userID"])) {
-    getRoleByID($_SESSION["userID"]) != 'banned') {
+    echo "logged out";
+} else if (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 {

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);
     ?>
@@ -38,7 +41,7 @@ foreach($friends as $i => $friend) {
                         <?= $friend->fullname ?><br/>
                         <span style='color: #666'><?php
                             if (isset($friend->username)) {
-                                echo $friend->username;
+                                echo $friend->usernameshort;
                             } else if (isset($friend->content)) {
                                 echo $friend->content;
                             }
@@ -48,6 +51,7 @@ foreach($friends as $i => $friend) {
             </button>
         </form>
         <?php
+        // Add friendship options if possible.
         if ($friendshipStatus > 1) {
             if ($friendshipStatus == 2) {
                 $denyName = "Annuleer";

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) {
     ?>
     <li class='group-item'>

website/public/bits/niet-slecht.php

@@ -0,0 +1,8 @@
+<?php
+if (isset($_GET["groupname"])) {
+    $url = "https://myhyvesbookplus.nl/~lars/group.php?groupname=" . $_GET["groupname"];
+} else {
+    $url = "https://myhyvesbookplus.nl/";
+}
+?>
+<a href="<?= $url ?>" target='_blank'><img style="width: 100%; height: auto;" src="../external/nietslecht_button.png" alt='\"Niet slecht\" ons op MyHyvesbook+' /></a>

website/public/createGroup.php

@@ -0,0 +1,36 @@
+<?php
+require_once "../queries/createGroup.php";
+require_once "../queries/connect.php";
+require_once "../queries/alerts.php"?>
+<!DOCTYPE html>
+<html>
+<head>
+    <?php include("../views/head.php"); ?>
+    <style>
+        @import url("styles/settings.css");
+    </style>
+</head>
+<body>
+<?php
+/*
+ * This view adds the main layout over the screen.
+ * Header and menu.
+ */
+include("../views/main.php");
+if ($_SERVER["REQUEST_METHOD"] == "POST") {
+    try {
+        createGroup();
+    } catch (AlertMessage $e) {
+
+    }
+    $groupname = $_POST["groupName"];
+    header("location: group.php?groupname=$groupname");
+}
+/* Add your view files here. */
+include("../views/createGroup.php");
+
+/* This adds the footer. */
+include("../views/footer.php");
+?>
+</body>
+</html>

website/public/fb-callback.php

@@ -1,71 +0,0 @@
-<?php
-$fb = new Facebook\Facebook([
-    'app_id' => $appID, // Replace {app-id} with your app id
-    'app_secret' => $appSecret,
-    'default_graph_version' => 'v2.2',
-]);
-
-$helper = $fb->getRedirectLoginHelper();
-
-try {
-    $accessToken = $helper->getAccessToken();
-} catch(Facebook\Exceptions\FacebookResponseException $e) {
-    // When Graph returns an error
-    echo 'Graph returned an error: ' . $e->getMessage();
-    exit;
-} catch(Facebook\Exceptions\FacebookSDKException $e) {
-    // When validation fails or other local issues
-    echo 'Facebook SDK returned an error: ' . $e->getMessage();
-    exit;
-}
-
-if (! isset($accessToken)) {
-    if ($helper->getError()) {
-        header('HTTP/1.0 401 Unauthorized');
-        echo "Error: " . $helper->getError() . "\n";
-        echo "Error Code: " . $helper->getErrorCode() . "\n";
-        echo "Error Reason: " . $helper->getErrorReason() . "\n";
-        echo "Error Description: " . $helper->getErrorDescription() . "\n";
-    } else {
-        header('HTTP/1.0 400 Bad Request');
-        echo 'Bad request';
-    }
-    exit;
-}
-
-// Logged in
-echo '<h3>Access Token</h3>';
-var_dump($accessToken->getValue());
-
-// The OAuth 2.0 client handler helps us manage access tokens
-$oAuth2Client = $fb->getOAuth2Client();
-
-// Get the access token metadata from /debug_token
-$tokenMetadata = $oAuth2Client->debugToken($accessToken);
-echo '<h3>Metadata</h3>';
-var_dump($tokenMetadata);
-
-// Validation (these will throw FacebookSDKException's when they fail)
-$tokenMetadata->validateAppId($appID); // Replace {app-id} with your app id
-// If you know the user ID this access token belongs to, you can validate it here
-//$tokenMetadata->validateUserId('123');
-$tokenMetadata->validateExpiration();
-
-if (! $accessToken->isLongLived()) {
-    // Exchanges a short-lived access token for a long-lived one
-    try {
-        $accessToken = $oAuth2Client->getLongLivedAccessToken($accessToken);
-    } catch (Facebook\Exceptions\FacebookSDKException $e) {
-        echo "<p>Error getting long-lived access token: " . $helper->getMessage() . "</p>\n\n";
-        exit;
-    }
-
-    echo '<h3>Long-lived</h3>';
-    var_dump($accessToken->getValue());
-}
-
-$_SESSION['fb_access_token'] = (string) $accessToken;
-
-// User is logged in with a long-lived access token.
-// You can redirect them to a members-only page.
-//header('Location: https://example.com/members.php');

website/public/group.php

@@ -13,13 +13,15 @@
 
 include_once("../queries/group_page.php");
 
-$group = selectGroupByName($_GET["groupname"]);
+if(isset($_SESSION["userID"]) and !$group = selectGroupByName($_GET["groupname"])) {
-$members = selectGroupMembers(2);
+    header("HTTP/1.0 404 Not Found");
+    header("Location: error/404.php");
+    die();
+}
+
+
+$members = selectGroupMembers($group["groupID"]);
 
-?>
-<script>alert("<?= $members[0] ?>");</script>
-<script>alert("<?= $members[1] ?>");</script>
-<?php
 
 /*
  * This view adds the main layout over the screen.

website/public/groupAdmin.php

@@ -0,0 +1,72 @@
+<?php
+require_once "../queries/picture.php";
+require_once "../queries/groupAdmin.php";
+require_once "../queries/alerts.php";
+?>
+<!DOCTYPE html>
+<html>
+<head>
+    <?php include("../views/head.php"); ?>
+<style>
+    /*Insert own stylesheet here ;)*/
+    @import url("styles/settings.css");
+</style>
+</head>
+<body>
+<?php
+/*
+ * This view adds the main layout over the screen.
+ * Header and menu.
+ */
+include("../views/main.php");
+$alertClass;
+$alertMessage;
+
+// Select which button has been pressed.
+if ($_SERVER["REQUEST_METHOD"] == "POST") {
+    try {
+        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;
+            case "deadmin":
+                if (!array_key_exists("userID", $_POST)) {
+                    throw new AngryAlert("Geen gebruiker geselecteerd.");
+                }
+                upgradeUser($_POST["groupID"], $_POST["userID"], "member");
+                break;
+            case "delete":
+                deleteGroup();
+                break;
+        }
+    } catch (AlertMessage $w) {
+        $alertClass = $w->getClass();
+        $alertMessage = $w->getMessage();
+    }
+}
+
+/* Add your view files here. */
+include("../views/groupAdmin.php");
+
+/* This adds the footer. */
+include("../views/footer.php");
+?>
+</body>
+</html>

website/public/js/admin.js

@@ -24,12 +24,14 @@ $(window).on("load", function () {
     });
 });
 
+// Toggles all checkboxes based on one.
 function checkAll() {
     $('.checkbox-list').each(function () {
         $(this).prop('checked', $('#checkall').prop('checked'));
     });
 }
 
+// Simple function that checks if checkall should stay checked.
 function checkCheckAll() {
     var checked = true;
 
@@ -43,6 +45,7 @@ function checkCheckAll() {
     $('#checkall').prop('checked', checked);
 }
 
+// Toggle of filter options.
 function changeFilter() {
     if ($('#pagetype').find(":selected").val() == "group") {
         document.getElementById('admin-filter').style.display = 'none';
@@ -59,11 +62,13 @@ function changeFilter() {
     }
 }
 
+// Sets the search page to one, relevant when changing filter or search.
 function searchFromOne() {
     $('#currentpage').prop('value', 1);
     adminSearch();
 }
 
+// AJAX live search.
 function adminSearch() {
     $.post(
         "API/adminSearchUsers.php",
@@ -74,6 +79,7 @@ function adminSearch() {
     })
 }
 
+// AJAX live update.
 function adminUpdate(form) {
     $.post(
         "API/adminChangeUser.php",
@@ -83,6 +89,7 @@ function adminUpdate(form) {
     })
 }
 
+// AJAX pagenumber functionality.
 function updatePageN() {
     $.post(
         "API/adminPageNumber.php",
@@ -92,11 +99,13 @@ function updatePageN() {
     })
 }
 
+// Intended for the edit button to show a form.
 function toggleBancomment(button) {
     $(button).siblings("div").toggle();
     $(button).toggle();
 }
 
+// AJAX value editing.
 function editComment(form) {
     $.post(
         "API/adminChangeUser.php",

website/public/js/chat.js

@@ -9,18 +9,25 @@ $(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);
                 $("#lastID").val(messages[messages.length - 1].messageID);
             }
+
+            loadUnreadMessages();
+
             gettingMessages = false;
         });
     } else {
@@ -28,7 +35,7 @@ function loadMessages() {
     }
 }
 
-
+// Send a message to a friend of the user.
 function sendMessage() {
     $.post(
         "API/sendMessage.php",
@@ -36,43 +43,60 @@ 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();
     });
 
     $("#newContent").val("");
-    loadMessages();
+    $("#newContent").focus();
 }
 
+// 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 thisTime = thisDate.getHours() + ":" + ('0' + thisDate.getMinutes()).slice(-2);
         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 += '\
+                    <div class="day-message"> \
+                        <div class="day-message-content">\
+                        ' + days[thisDate.getDay()] + " " + thisDate.getDate() + " " + months[thisDate.getMonth()] + " " + thisDate.getFullYear() + '\
+                        </div> \
+                    </div>';
+            }
             previousDate = thisDate;
-            messagesText += '\
+            previousTime = thisTime;
-                <div class="day-message"> \
+            previousType = type;
-                    <div class="day-message-content">\
-                    ' + days[thisDate.getDay()] + " " + thisDate.getDate() + " " + months[thisDate.getMonth()] + " " + thisDate.getFullYear() + '\
-                    </div> \
-                </div>';
             messagesText += '<div class="chat-message"><div class="' + type + '">';
+        // 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 += '<div class="chat-time">\
                     ' + thisTime + '\
                     </div></div></div>';
 
             previousTime = thisTime;
             previousType = type;
+            // If the date is different, add a new date.
             if (thisDate > previousDate) {
                 previousDate = thisDate;
                 messagesText += '\
@@ -83,8 +107,11 @@ function addMessages(messages) {
                     </div>';
             }
 
+            // Open the new message.
             messagesText += '<div class="chat-message"><div class="' + type + '">';
         }
+
+        // Add the content of the message in the new box.
         messagesText += fancyText(messages[i].content) + "<br />";
     }
 
@@ -93,11 +120,14 @@ function addMessages(messages) {
                     ' + thisTime + '\
                     </div></div></div>';
 
+    // 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 +138,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");
 }

website/public/js/dobPicker.js

@@ -1,123 +0,0 @@
-/**
- * jQuery DOB Picker
- * Website: https://github.com/tyea/dobpicker
- * Version: 1.0
- * Author: Tom Yeadon
- * License: BSD 3-Clause
- */
-
-jQuery.extend({
-
-	dobPicker: function(params) {
-
-		// set the defaults		
-		if (typeof(params.dayDefault)==='undefined') params.dayDefault = 'Day';
-		if (typeof(params.monthDefault)==='undefined') params.monthDefault = 'Month';
-		if (typeof(params.yearDefault)==='undefined') params.yearDefault = 'Year';
-		if (typeof(params.minimumAge)==='undefined') params.minimumAge = 12;
-		if (typeof(params.maximumAge)==='undefined') params.maximumAge = 80;
-
-		// set the default messages		
-		$(params.daySelector).append('<option value="">' + params.dayDefault + '</option>');
-		$(params.monthSelector).append('<option value="">' + params.monthDefault + '</option>');
-		$(params.yearSelector).append('<option value="">' + params.yearDefault + '</option>');
-
-		// populate the day select
-		for (i = 1; i <= 31; i++) {
-			if (i <= 9) {
-				var val = '0' + i;
-			} else {
-				var val = i;
-			}
-			$(params.daySelector).append('<option value="' + val + '">' + i + '</option>');
-		}
-
-		// populate the month select		
-		var months = [
-			"January",
-			"February",
-			"March",
-			"April",
-			"May",
-			"June",
-			"July",
-			"August",
-			"September",
-			"October",
-			"November",
-			"December"
-		];
-			
-		for (i = 1; i <= 12; i++) {
-			if (i <= 9) {
-				var val = '0' + i;
-			} else {
-				var val = i;
-			}
-			$(params.monthSelector).append('<option value="' + val + '">' + months[i - 1] + '</option>');
-		}
-
-		// populate the year select
-		var date = new Date();
-		var year = date.getFullYear();
-		var start = year - params.minimumAge;
-		var count = start - params.maximumAge;
-		
-		for (i = start; i >= count; i--) {
-			$(params.yearSelector).append('<option value="' + i + '">' + i + '</option>');
-		}
-		
-		// do the logic for the day select
-		$(params.daySelector).change(function() {
-			
-			$(params.monthSelector)[0].selectedIndex = 0;
-			$(params.yearSelector)[0].selectedIndex = 0;
-			$(params.yearSelector + ' option').removeAttr('disabled');
-			
-			if ($(params.daySelector).val() >= 1 && $(params.daySelector).val() <= 29) {
-			
-				$(params.monthSelector + ' option').removeAttr('disabled');
-				
-			} else if ($(params.daySelector).val() == 30) {
-			
-				$(params.monthSelector + ' option').removeAttr('disabled');
-				$(params.monthSelector + ' option[value="02"]').attr('disabled', 'disabled');
-				
-			} else if($(params.daySelector).val() == 31) {
-			
-				$(params.monthSelector + ' option').removeAttr('disabled');
-				$(params.monthSelector + ' option[value="02"]').attr('disabled', 'disabled');
-				$(params.monthSelector + ' option[value="04"]').attr('disabled', 'disabled');
-				$(params.monthSelector + ' option[value="06"]').attr('disabled', 'disabled');
-				$(params.monthSelector + ' option[value="09"]').attr('disabled', 'disabled');
-				$(params.monthSelector + ' option[value="11"]').attr('disabled', 'disabled');
-				
-			}
-			
-		});
-		
-		// do the logic for the month select
-		$(params.monthSelector).change(function() {
-			
-			$(params.yearSelector)[0].selectedIndex = 0;
-			$(params.yearSelector + ' option').removeAttr('disabled');
-			
-			if ($(params.daySelector).val() == 29 && $(params.monthSelector).val() == '02') {
-			
-				$(params.yearSelector + ' option').each(function(index) {
-					if (index !== 0) {
-						var year = $(this).attr('value');
-						var leap = !((year % 4) || (!(year % 100) && (year % 400)));
-						if (leap === false) {
-							$(this).attr('disabled', 'disabled');
-						}
-					}
-				});
-				
-			}
-			
-		});
-		
-	}
-	
-});

website/public/js/dobPicker.min.js

@@ -1 +0,0 @@
-jQuery.extend({dobPicker:function(a){for("undefined"==typeof a.dayDefault&&(a.dayDefault="Day"),"undefined"==typeof a.monthDefault&&(a.monthDefault="Month"),"undefined"==typeof a.yearDefault&&(a.yearDefault="Year"),"undefined"==typeof a.minimumAge&&(a.minimumAge=12),"undefined"==typeof a.maximumAge&&(a.maximumAge=80),$(a.daySelector).append('<option value="">'+a.dayDefault+"</option>"),$(a.monthSelector).append('<option value="">'+a.monthDefault+"</option>"),$(a.yearSelector).append('<option value="">'+a.yearDefault+"</option>"),i=1;i<=31;i++){if(i<=9)var b="0"+i;else var b=i;$(a.daySelector).append('<option value="'+b+'">'+i+"</option>")}var c=["January","February","March","April","May","June","July","August","September","October","November","December"];for(i=1;i<=12;i++){if(i<=9)var b="0"+i;else var b=i;$(a.monthSelector).append('<option value="'+b+'">'+c[i-1]+"</option>")}var d=new Date,e=d.getFullYear(),f=e-a.minimumAge,g=f-a.maximumAge;for(i=f;i>=g;i--)$(a.yearSelector).append('<option value="'+i+'">'+i+"</option>");$(a.daySelector).change(function(){$(a.monthSelector)[0].selectedIndex=0,$(a.yearSelector)[0].selectedIndex=0,$(a.yearSelector+" option").removeAttr("disabled"),$(a.daySelector).val()>=1&&$(a.daySelector).val()<=29?$(a.monthSelector+" option").removeAttr("disabled"):30==$(a.daySelector).val()?($(a.monthSelector+" option").removeAttr("disabled"),$(a.monthSelector+' option[value="02"]').attr("disabled","disabled")):31==$(a.daySelector).val()&&($(a.monthSelector+" option").removeAttr("disabled"),$(a.monthSelector+' option[value="02"]').attr("disabled","disabled"),$(a.monthSelector+' option[value="04"]').attr("disabled","disabled"),$(a.monthSelector+' option[value="06"]').attr("disabled","disabled"),$(a.monthSelector+' option[value="09"]').attr("disabled","disabled"),$(a.monthSelector+' option[value="11"]').attr("disabled","disabled"))}),$(a.monthSelector).change(function(){$(a.yearSelector)[0].selectedIndex=0,$(a.yearSelector+" option").removeAttr("disabled"),29==$(a.daySelector).val()&&"02"==$(a.monthSelector).val()&&$(a.yearSelector+" option").each(function(a){if(0!==a){var b=$(this).attr("value"),c=!(b%4||!(b%100)&&b%400);c===!1&&$(this).attr("disabled","disabled")}})})}});

website/public/js/friendButtons.js

@@ -19,24 +19,24 @@ function placeFriendButtons() {
                     case "0":
                         value1 = "request";
                         class1 = "green";
-                        text1 = "Bevriend";
+                        text1 = "Word vrienden";
-                        icon1 = "fa-handshake-o";
+                        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";
+                        text2 = "Ontvriend";
-                        icon2 = "fa-times";
+                        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(
-                    "<button class='"+ class1 +" friend-button' value='"+ value1 +"'>" +
+                    "<div><button class='"+ class1 +" fancy-button friend-button' value='"+ value1 +"'>" +
-                        "<i class='fa "+ icon1 +"'></i> " + text1 +
+                    "<span>"+ text1 +"</span>" +
-                    "</button>");
+                    "<i class='fa fa-fw "+ icon1 +"'></i> " +
+                    "</button></div>");
                 $buttonContainer.append(
-                    "<button class='"+ class2 +" friend-button' value='"+ value2 +"'>" +
+                    "<div><button class='"+ class2 +" fancy-button friend-button' value='"+ value2 +"'>" +
-                        "<i class='fa "+ icon2 +"'></i> " + text2 +
+                    "<span>"+ text2 +"</span>" +
-                    "</button>");
+                    "<i class='fa fa-fw "+ icon2 +"'></i> " +
+                    "</button></div>");
 
 
-            $buttonContainer.children().click(function() {
+            $buttonContainer.find("button").click(function() {
                 if (isNaN(this.value))
                     editFriendship(userID, this.value);
                 else if (this.value != "")

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(
-                    "<button class='green group-button' value='request'>" +
+                    "<button class='green group-button fancy-button' value='request'>" +
-                    "<i class='fa fa-plus'></i> Voeg toe" +
+                    "<span>Treed toe</span><i class='fa fa-plus'></i>" +
                     "</button>");
-            } else if(data == 'request') {
+            } else if (data == 'request') {
                 $buttonContainer.append(
-                    "<button class='red group-button' value='none'>" +
+                    "<button class='red group-button fancy-button' value='none'>" +
-                    "<i class='fa fa-times'></i> Trek verzoek in" +
+                    "<span>Trek verzoek in</span><i class='fa fa-times'></i>" +
                     "</button>");
+            } else if (data == 'admin') {
+                $buttonContainer.append(
+                    "<button class='group-button fancy-button' value='admin'>" +
+                        "<span>Instellingen</span><i class='fa fa-cogs'></i>" +
+                        "</button>"
+                );
             } else {
                 $buttonContainer.append(
-                    "<button class='red group-button' value='none'>" +
+                    "<button class='red group-button fancy-button' value='none'>" +
-                    "<i class='fa fa-times'></i> Verlaat groep" +
+                    "<span>Verlaat groep</span><i class='fa fa-sign-out'></i>" +
                     "</button>");
             }
 
             $buttonContainer.children().click(function() {
-                $.post("API/editMembership.php", { grp: groupID, role: this.value })
+                if (this.value == 'admin') {
-                    .done(function() {
+                    window.location.href='groupAdmin.php?groupID=' + groupID;
-                        $buttonContainer.children().remove();
+                } else {
-                        placeGroupButtons();
+                    $.post("API/editMembership.php", {grp: groupID, role: this.value})
-                        updateMenus();
+                        .done(function () {
-                    }).fail(function() {
+                            $buttonContainer.children().remove();
-                });
+                            placeGroupButtons();
+                            updateMenus();
+                        }).fail(function () {
+                    });
+                }
             });
 
     });

website/public/js/loginRegisterModals.js

@@ -0,0 +1,68 @@
+
+// Get the modal
+var modal = document.getElementById('myModal');
+var registerModal = document.getElementById('registerModal');
+var facebookModal = document.getElementById("fbModal");
+
+// Get the button that opens the modal
+var registerBtn = document.getElementById("registerBtn");
+var btn = document.getElementById("myBtn");
+
+
+// Get the <span> element that closes the modal
+var span = document.getElementsByClassName("close")[0];
+var registerSpan = document.getElementsByClassName("close")[1];
+var facebookCLose = document.getElementsByClassName("close")[2];
+
+/**
+ * When the user clicks the button, open the modal
+ */
+btn.onclick = function () {
+    modal.style.display = "block";
+
+}
+registerBtn.onclick = function () {
+    registerModal.style.display = "block";
+}
+
+/**
+ * WHen the user clicks on (X), close the modal
+ */
+span.onclick = function () {
+    modal.style.display = "none";
+}
+registerSpan.onclick = function () {
+    registerModal.style.display = "none";
+}
+facebookCLose.onclick = function () {
+    facebookModal.style.display = "none";
+}
+
+/**
+ * When the user clicks anywhere outside of the modal, close it
+ */
+window.onclick = function (event) {
+    if (event.target == modal) {
+        modal.style.display = "none";
+    }
+    if (event.target == registerModal) {
+        registerModal.style.display = "none";
+    }
+    if (event.target == facebookModal) {
+        facebookModal.style.display = "none";
+    }
+}
+
+/**
+ * When ESC is pressed, close modal
+ */
+document.addEventListener('keyup', function(e) {
+    if (e.keyCode == 27) {
+        modal.style.display = "none";
+        registerModal.style.display = "none";
+
+    }
+});
+/**
+ * Created by joey on 2-2-17.
+ */

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(/(https?:\/\/.[^ \n<>"]*)/ig, function(link) {
-    text = text.replace(regex, function(link) {
         // Add images
         if (link.match(/(https?:\/\/.[^ ]*\.(?:png|jpg|jpeg|gif))/ig)) {
             return "<img alt='" + link + "' src='" + link + "' />";
@@ -14,14 +13,14 @@ function fancyText(text) {
             return "<video width='100%'>" +
                         "<source src='"+ link +"' type='video/mp4'>" +
                         "<b>Je browser ondersteund geen video</b>" +
-                "</video><button class='gray' onclick='$(this).prev().get(0).play();'>Speel af</button>";
+                "</video><button class='gray' onclick='$(this).prev().get(0).play();'><i class='fa fa-play'></i></button>";
         }
         // Add ogg video's
         else if (link.match(/(https?:\/\/.[^ ]*\.(?:ogg))/ig)) {
             return "<video width='100%'>" +
                 "<source src='"+ link +"' type='video/ogg'>" +
                 "<b>Je browser ondersteund geen video</b>" +
-                "</video><button onclick='$(this).prev().get(0).play();'>Speel af</button>";
+                "</video><button class='gray' onclick='$(this).prev().get(0).play();'><i class='fa fa-play'></i></button>";
         }
         // Add youtube video's
         else if (link.match(/(https?:\/\/.(www.)?youtube|youtu.be)*watch/ig)) {
@@ -31,13 +30,15 @@ function fancyText(text) {
         }
         // Add links
         else {
-            return "<a href='" + link + "'>" + link + "</a>";
+            return "<a href='" + link + "' target='_blank'>" + link + "</a>";
         }
     });
 
     return text;
 }
 
+// This function gets the value of a cookie when given a key.
+// If it didn´t find any compatible cookie, it returns false.
 function getCookie(key) {
     cookies = document.cookie.split("; ");
     for (var i in cookies) {
@@ -49,6 +50,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 +59,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 +73,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 +90,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", {

website/public/js/masonry.js

@@ -26,19 +26,41 @@ 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,
                                      group : groupID })
-            .done(function() {
+            .done(function(data) {
-                masonry(masonryMode);
+                if (data == "empty") {
+                    $('#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);
+                }
             });
     } else {
         $.post("API/postPost.php", { title: title,
                                      content : content })
-            .done(function() {
+            .done(function(data) {
-                masonry(masonryMode);
+                if (data == "empty") {
+                    $('#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);
+                }
             });
     }
 
@@ -69,6 +91,21 @@ $(window).on("load", function() {
             loadMorePosts(userID, groupID, postAmount, postLimit);
         }
     };
+
+    $(document).keyup(function(e) {
+        if (e.keyCode == 27) {
+            closeModal();
+        }
+    });
+
+    $('.modal').click(function() {
+        closeModal();
+    });
+
+    $('.modal-content').click(function(event){
+        event.stopPropagation();
+    });
+
 });
 
 function closeModal() {
@@ -98,6 +135,10 @@ function masonry(mode) {
     masonryMode = mode;
     $container.children().remove();
 
+    // reinit posts
+    noposts = false;
+    postAmount = 0;
+
     /*
      * Initialise columns.
      */
@@ -120,7 +161,7 @@ function masonry(mode) {
 
         $form.append($("<input class=\"newpost\" name=\"title\" placeholder=\"Titel\" type=\"text\">"));
         $form.append($("<textarea class=\"newpost\" name=\"content\" placeholder=\"Schrijf een berichtje...\" maxlength='1000'></textarea><span></span>"));
-        $form.append($("<input value=\"Plaats!\" type=\"submit\">"));
+        $form.append($("<button type=\"submit\"><i class='fa fa-sticky-note-o'></i> Plaats!</button>"));
         columns[0][1].append($postInput);
 
         columns[0][0] = $postInput.height() + margin;
@@ -153,9 +194,6 @@ function loadMorePosts(uID, gID, offset, limit) {
         return;
     }
 
-    console.log(uID, gID, offset, limit);
-
-
     $.post("API/getPosts.php", { usr : uID,
                                  grp : gID,
                                  offset : offset,

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,10 +32,10 @@ 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();
     masonry(masonryMode);
-
-
 }

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(

website/public/login.php

@@ -13,18 +13,12 @@
 ?>
 <body>
 <?php
-    session_start();
 
-    // Checks if there's an user already logged in
-    if(isset($_SESSION["userID"])){
-      echo "<script>
-                window.onload=checkLoggedIn();
-            </script>";
-    }
 include("../views/homeLoginRegister.php");
 
 /* This view adds login view */
 include("../views/login-view.php");
 ?>
+<script src="js/loginRegisterModals.js"></script>;
 </body>
 </html>

website/public/profile.php

@@ -25,9 +25,16 @@ if(empty($_GET["username"])) {
     $userID = getUserID($_GET["username"]);
 }
 
-$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();
+}
+
 $profile_friends = selectAllFriends($userID);
 $profile_groups = selectAllUserGroups($userID);
+$showProfile = $user["showProfile"] || ($user["status"] == 'confirmed') || $_SESSION["userID"] == $userID;
 
 
 if ($userID == $_SESSION["userID"]) {

website/public/register(stash).php

@@ -1,116 +0,0 @@
-<!DOCTYPE html>
-<html>
-<?php
-    include("../views/login_head.php");
-    require_once("../queries/connect.php");
-    include_once("../queries/register.php");
-    include_once("../queries/checkInput.php");
-    include_once("../queries/emailconfirm.php");
-?>
-<body>
-<?php
-    session_start();
-
-    if(isset($_SESSION["userID"])){
-        header("location: login.php");
-    }
-    // define variables and set to empty values
-    $name = $surname = $bday = $username = $password = $confirmpassword = $location = $housenumber = $email = $confirmEmail = $captcha = $ip = "";
-    $genericErr = $nameErr = $surnameErr = $bdayErr = $usernameErr = $passwordErr = $confirmpasswordErr = $locationErr = $housenumberErr = $emailErr = $confirmEmailErr = $captchaErr = "";
-    $correct = true;
-    $day_date = "dag";
-    $month_date = "maand";
-    $year_date = "jaar";
-
-    // Trying to register an account
-    if ($_SERVER["REQUEST_METHOD"] == "POST") {
-        try {
-            $name = test_input(($_POST["name"]));
-            checkInputChoice($name, "lettersAndSpaces");
-        } catch(lettersAndSpacesException $e){
-            $correct = false;
-            $nameErr = $e->getMessage();
-        }
-
-        try {
-            $surname = test_input(($_POST["surname"]));
-            checkInputChoice($surname, "lettersAndSpaces");
-        }
-        catch(lettersAndSpacesException $e){
-            $correct = false;
-            $surnameErr = $e->getMessage();
-        }
-
-        try{
-            $day_date = test_input(($_POST["day_date"]));
-            $month_date = test_input(($_POST["month_date"]));
-            $year_date = test_input(($_POST["year_date"]));
-            $bday = $year_date . "-" . $month_date . "-" . $day_date;
-            checkInputChoice($bday, "bday");
-        } catch(bdayException $e){
-            $correct = false;
-            $bdayErr = $e->getMessage();
-        }
-
-        try{
-            $username = str_replace(' ', '', test_input(($_POST["username"])));
-            checkInputChoice($username, "username");
-        } catch(usernameException $e){
-            $correct = false;
-            $usernameErr = $e->getMessage();
-        }
-
-        try{
-            $password = str_replace(' ', '', test_input(($_POST["password"])));
-            checkInputChoice($password, "longerEight");
-            matchPassword();
-        } catch(passwordException $e){
-            $correct = false;
-            $passwordErr = $e->getMessage();
-        } catch(confirmPasswordException $e){
-            $correct = false;
-            $confirmPasswordErr = $e->getMessage();
-        }
-
-        try{
-            $location = test_input(($_POST["location"]));
-            checkInputChoice($location, "lettersAndSpaces");
-        } catch(lettersAndSpacesException $e){
-            $correct = false;
-            $locationErr = $e->getMessage();
-        }
-
-        try{
-            $email = test_input(($_POST["email"]));
-            checkInputChoice($email, "email");
-            $confirmEmail = test_input(($_POST["confirmEmail"]));
-            matchEmail();
-        } catch(emailException $e){
-            $correct = false;
-            $emailErr = $e->getMessage();
-        } catch(confirmEmailException $e){
-            $correct = false;
-            $confirmEmailErr = $e->getMessage();
-        }
-
-        try{
-            $captcha = $_POST['g-recaptcha-response'];
-            checkCaptcha($captcha);
-        } catch(captchaException $e){
-            $correct = false;
-            $captchaErr = $e->getMessage();
-        }
-
-        try {
-            getIp();
-            registerCheck($correct);
-            sendConfirmEmailUsername($username);
-        } catch(registerException $e){
-            $genericErr = $e->getMessage();
-        }
-    }
-/* This view adds register view */
-include("../views/register-view.php");
-?>
-</body>
-</html>

website/public/settings.php

@@ -14,11 +14,13 @@
 <?php
 $alertClass;
 $alertMessage;
+
+// Select which button has been pressed.
 if ($_SERVER["REQUEST_METHOD"] == "POST") {
     try {
         switch ($_POST["form"]) {
             case "profile":
-                updateSettings();
+                checkUpdateSettings();
                 break;
             case "password":
                 changePassword();
@@ -29,7 +31,6 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
             case "picture":
                 updateAvatar();
                 break;
-
         }
     } catch (AlertMessage $w) {
         $alertClass = $w->getClass();

website/public/styles/adminpanel.css

@@ -1,11 +1,13 @@
-.admin-panel {
-    min-width: 800px;
-}
 
 .admin-panel input[type="radio"], input[type="checkbox"] {
     vertical-align: middle;
-    height: 28px;
+    height: 14px;
-    margin: 2px;
+    width: 14px;
+    margin: 7px;
+}
+
+.table-checkbox {
+    width: 28px;
 }
 
 .admin-searchform {
@@ -34,13 +36,15 @@
     width: 100%;
 }
 
-.usertable .table-username {width: 150px}
+.table-checkbox {width: 20px}
-.usertable .table-status {width: 100px}
+.table-username {width: 150px}
-.usertable .table-action {width: 200px}
+.table-status {width: 100px}
+.table-action {width: 200px}
 
 .usertable th, td {
     border-bottom: 1px solid #ddd;
     padding: 3px;
+    word-wrap: break-word;
 }
 
 .usertable th, tr {
@@ -51,6 +55,10 @@
     background-color: #f5f5f5;
 }
 
+.bancomment {
+    width: 80%;
+}
+
 .bancommentedit {
     display: none;
 }

website/public/styles/index.css

@@ -133,6 +133,12 @@ label {
     color: red;
 }
 
+.login_containerNoscript {
+    padding: 4px;
+    text-align: center;
+    color: red;
+}
+
 @keyframes animatezoom {
     from {transform: scale(0)}
     to {transform: scale(1)}
@@ -150,7 +156,7 @@ label {
     margin: 16px auto;
     overflow-y: auto;
     padding: 20px;
-    width: 600px;
+    width: 650px;
 }
 
 select{
@@ -192,12 +198,6 @@ ul {
     animation-duration: 0.4s
 }
 
-/* Add Animation */
-@-webkit-keyframes animatetop {
-    from {top:-300px; opacity:0}
-    to {top:0; opacity:1}
-}
-
 @keyframes animatetop {
     from {top:-300px; opacity:0}
     to {top:0; opacity:1}

website/public/styles/main.css

@@ -102,7 +102,6 @@ p {
 
 .group-picture {
     border-radius: 5px;
-    border: none;
 }
 
 .item-box, .item-box-full-width {
@@ -117,7 +116,7 @@ p {
 
 @media only screen and (max-width: 1400px) {
     .item-box {
-        width: calc(100% - 50px);
+        width: calc(100% - 50px)!important;
     }
 }
 
@@ -257,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;
@@ -291,19 +288,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;

website/public/styles/post-popup.css

@@ -48,6 +48,10 @@
     width: 90%;
 }
 
+.post-content a {
+    text-decoration: underline;
+}
+
 .commentfield {
     margin-bottom: 20px;
 }
@@ -87,17 +91,5 @@
 
 .deleteButton {
     background-color: firebrick;
-
+    float: right;
-}
-
-.deleteButton i {
-    display: inline-block;
-}
-
-.deleteButton:hover span {
-    display: inline-block;
-}
-
-.deleteButton span {
-    display: none;
 }

website/public/styles/profile.css

@@ -1,5 +1,14 @@
 /* New */
 
+.alertbox {
+    display: none;
+    background-color: firebrick;
+}
+
+.alerttext {
+    color: white;
+}
+
 .user-box {
     text-align: center;
 }
@@ -11,21 +20,29 @@
     display: inline-block;
 }
 
-.friend-button-container {
+.friend-button-container, .group-button-container {
     position: relative;
     float: right;
     width: 200px;
     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;
-    width: 200px;
 
     font-size: 18px;
 }
+.status-buttons-container button {
+    float: left;
+}
 
 .group-button-container button {
     float: right;
@@ -62,10 +79,24 @@
 
 .group-picture {
     border: none;
-    margin-bottom: 0;
-    margin-right: 15px;
 }
 
+.fancy-button span {
+    display: none;
+}
+
+.fancy-button:hover {
+    text-align: right;
+}
+
+.fancy-button i {
+    display: inline-block;
+}
+
+.fancy-button:hover span {
+    display: inline-block;
+    margin-right: 5px;
+}
 
 /* Old */
 
@@ -90,6 +121,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);
 }
@@ -108,7 +143,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%;
 }
 

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;
 }

website/queries/checkInput.php

@@ -41,16 +41,26 @@ function checkInputChoice($variable, $option){
     }
 }
 
-/* Checks for only letters and spaces. */
+/**
+ * Checks for only letters and spaces.
+ * @param $variable
+ * @throws lettersAndSpacesException
+ */
 function checkName($variable){
     if (empty($variable)) {
         throw new lettersAndSpacesException("Verplicht!");
     } else if (!preg_match("/^[a-zA-Z ]*$/", $variable)) {
         throw new lettersAndSpacesException("Alleen letters en spaties zijn toegestaan!");
+    } else if (strlen($variable) > 63){
+        throw new lettersAndSpacesException(("Mag maximaal 63 karakters hebben!"));
     }
 }
 
-/* Checks for bday */
+/**
+ * Checks for bday
+ * @param $variable
+ * @throws bdayException
+ */
 function validateBday($variable){
     if (empty($variable)) {
         throw new bdayException("Verplicht!");
@@ -66,7 +76,7 @@ function validateBday($variable){
     }
 }
 
-// Checks for date
+/* Checks for date */
 function validateDate($date, $format)
 {
     $d = DateTime::createFromFormat($format, $date);
@@ -81,6 +91,8 @@ function username($variable){
         throw new usernameException("Moet minstens 6 karakters bevatten");
     } else if (getExistingUsername() == 1) {
         throw new usernameException("Gebruikersnaam bestaal al");
+    } else if (strlen($variable) > 50) {
+        throw new usernameException("Mag maximaal 50 karakters!");
     }
 }
 
@@ -92,6 +104,8 @@ function fbUsername($variable){
         throw new usernameException("Moet minstens 6 karakters bevatten");
     } else if (getExistingFBUsername() == 1) {
         throw new usernameException("Gebruikersnaam bestaal al");
+    } else if (strlen($variable) > 50) {
+        throw new usernameException("Mag maximaal 50 karakters!");
     }
 }
 
@@ -101,6 +115,8 @@ function longerEight($variable){
         throw new passwordException("Verplicht!");
     } else if (strlen($variable) < 8) {
         throw new passwordException("Moet minstens 8 karakters bevatten");
+    } else if (strlen($variable) > 50) {
+        throw new usernameException("Mag maximaal 50 karakters!");
     }
 }
 
@@ -112,6 +128,8 @@ function validateEmail($variable){
         throw new emailException("Geldige email invullen");
     } else if (getExistingEmail() == 1){
         throw new emailException("Email bestaal al!");
+    } else if (strlen($variable) > 255) {
+        throw new emailException("Mag maximaal 50 karakters!");
     }
 }
 
@@ -122,10 +140,13 @@ function validateFBEmail($variable){
     } else if (!filter_var($variable, FILTER_VALIDATE_EMAIL)) {
         throw new emailException("Geldige email invullen");
     } else if (getExistingFBEmail() == 1){
-        throw new emailException("Email bestaal al!");
+        throw new emailException("Uw email wordt al gebruikt voor een ander account!");
+    } else if (strlen($variable) > 255) {
+        throw new emailException("Mag maximaal 50 karakters!");
     }
 }
 
+/* checks if email is the same */
 function matchEmail(){
     if (strtolower($_POST["email"]) != strtolower($_POST["confirmEmail"])){
         throw new confirmEmailException("Emails matchen niet!");
@@ -141,7 +162,6 @@ function resetEmail($variable){
     }
 }
 
-
 /* checks if two passwords matches. */
 function matchPassword(){
     if ($_POST["password"] != $_POST["confirmpassword"]) {
@@ -204,9 +224,13 @@ function test_input($data) {
     $data = trim($data);
     $data = stripslashes($data);
     $data = htmlspecialchars($data);
+    $data = trim($data);
     return $data;
 }
 
+/**
+ * Class lettersAndSpacesException
+ */
 class lettersAndSpacesException extends Exception
 {
     public function __construct($message = "", $code = 0, Exception $previous = null)
@@ -215,7 +239,9 @@ class lettersAndSpacesException extends Exception
     }
 }
 
-
+/**
+ * Class bdayException
+ */
 class bdayException extends Exception
 {
     public function __construct($message = "", $code = 0, Exception $previous = null)
@@ -224,6 +250,9 @@ class bdayException extends Exception
     }
 }
 
+/**
+ * Class usernameException
+ */
 class usernameException extends Exception
 {
     public function __construct($message = "", $code = 0, Exception $previous = null)
@@ -232,6 +261,9 @@ class usernameException extends Exception
     }
 }
 
+/**
+ * Class passwordException
+ */
 class passwordException extends Exception
 {
     public function __construct($message = "", $code = 0, Exception $previous = null)
@@ -240,6 +272,9 @@ class passwordException extends Exception
     }
 }
 
+/**
+ * Class confirmPasswordException
+ */
 class confirmPasswordException extends Exception
 {
     public function __construct($message = "", $code = 0, Exception $previous = null)
@@ -248,6 +283,9 @@ class confirmPasswordException extends Exception
     }
 }
 
+/**
+ * Class fbConfirmPasswordException
+ */
 class fbConfirmPasswordException extends Exception
 {
     public function __construct($message = "", $code = 0, Exception $previous = null)
@@ -256,6 +294,9 @@ class fbConfirmPasswordException extends Exception
     }
 }
 
+/**
+ * Class emailException
+ */
 class emailException extends Exception
 {
     public function __construct($message = "", $code = 0, Exception $previous = null)
@@ -264,6 +305,9 @@ class emailException extends Exception
     }
 }
 
+/**
+ * Class confirmEmailException
+ */
 class confirmEmailException extends Exception
 {
     public function __construct($message = "", $code = 0, Exception $previous = null)
@@ -272,6 +316,9 @@ class confirmEmailException extends Exception
     }
 }
 
+/**
+ * Class captchaException
+ */
 class captchaException extends Exception
 {
     public function __construct($message = "", $code = 0, Exception $previous = null)
@@ -280,6 +327,9 @@ class captchaException extends Exception
     }
 }
 
+/**
+ * Class registerException
+ */
 class registerException extends Exception
 {
     public function __construct($message = "", $code = 0, Exception $previous = null)

website/queries/connect.php

@@ -10,6 +10,11 @@ else {
     or die('Error connecting to mysql server');
 }
 
+/**
+ * Helperfunction to create a database query.
+ * @param string $query
+ * @return PDOStatement
+ */
 function prepareQuery(string $query) : PDOStatement {
     return $GLOBALS["db"]->prepare($query);
 }

website/queries/createGroup.php

@@ -0,0 +1,44 @@
+<?php
+require_once "../queries/checkInput.php";
+require_once "../queries/picture.php";
+require_once "../queries/alerts.php";
+
+/**
+ * Creates a group.
+ */
+function createGroup()
+{
+    // Creates the group.
+    $createGroup = prepareQuery("
+    INSERT INTO
+        `group_page` (`name`, `description`)
+    VALUES (:name, :description);
+    ");
+    $createGroup->bindValue(':name', test_input($_POST["groupName"]), PDO::PARAM_STR);
+    $createGroup->bindValue(':description', test_input($_POST["bio"]));
+    $createGroup->execute();
+
+    // Gets the groupID just created.
+    $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"];
+
+    // Adds the user as an admin.
+    $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);
+}

website/queries/emailconfirm.php

@@ -1,5 +1,8 @@
 <?php
-
+/**
+ * Sends a confirm email if you know the username.
+ * @param string $username
+ */
 function sendConfirmEmailUsername(string $username) {
     $stmt = prepareQuery("
     SELECT
@@ -15,6 +18,10 @@ function sendConfirmEmailUsername(string $username) {
     sendConfirmEmail($userID);
 }
 
+/**
+ * Sends a confirm email if you know the userID.
+ * @param int $userID
+ */
 function sendConfirmEmail(int $userID) {
     $stmt = prepareQuery("
     SELECT 

website/queries/friendship.php

@@ -2,21 +2,33 @@
 
 require_once ("connect.php");
 
+/**
+ * Selects all friends of a user.
+ * @param $userID
+ * @return string
+ */
 function selectFriends($userID) {
     return selectLimitedFriends($userID, 9999);
 }
 
+/**
+ * Returns a limited amount of friends of a user.
+ * @param $userID
+ * @param $limit
+ * @return string
+ */
 function selectLimitedFriends($userID, $limit) {
     $stmt = prepareQuery("
         SELECT
             `userID`,
+            LEFT(`username`, 12) as `usernameshort`,
             `username`,
-            LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 15) as `fullname`,
+            LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 12) as `fullname`,
             IFNULL(
                 `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`,
@@ -45,18 +57,23 @@ function selectLimitedFriends($userID, $limit) {
     return json_encode($stmt->fetchAll());
 }
 
-
+/**
+ * Selects all friends of a user.
+ * @param $userID
+ * @return PDOStatement
+ */
 function selectAllFriends($userID) {
     $stmt = prepareQuery("
         SELECT
             `userID`,
+            LEFT(`username`, 12) as `usernameshort`,
             `username`,
-            LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 15) as `fullname`,
+            LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 12) as `fullname`,
             IFNULL(
                 `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`,
@@ -81,17 +98,22 @@ function selectAllFriends($userID) {
     return $stmt;
 }
 
+/**
+ * Returns all friend requests of the current user.
+ * @return string
+ */
 function selectAllFriendRequests() {
     $stmt = prepareQuery("
         SELECT
             `userID`,
+            LEFT(`username`, 12) as `usernameshort`,
             `username`,
-            LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 15) as `fullname`,
+            LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 12) as `fullname`,
             IFNULL(
                 `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`,
@@ -116,6 +138,11 @@ function selectAllFriendRequests() {
     return json_encode($stmt->fetchAll());
 }
 
+/**
+ * Gets the friendship status from current user and userID.
+ * @param $userID
+ * @return int
+ */
 function getFriendshipStatus($userID) {
     # -2: Query failed.
     # -1: user1 and 2 are the same user
@@ -159,6 +186,11 @@ function getFriendshipStatus($userID) {
     return intval($stmt->fetch()["friend_state"]);
 }
 
+/**
+ * Request friendship from current user to target user.
+ * @param $userID
+ * @return bool
+ */
 function requestFriendship($userID) {
     $stmt = prepareQuery("
         INSERT INTO `friendship` (user1ID, user2ID)
@@ -170,6 +202,11 @@ function requestFriendship($userID) {
     return $stmt->execute();
 }
 
+/**
+ * Removes friendship between current and target user.
+ * @param $userID
+ * @return bool
+ */
 function removeFriendship($userID) {
     $stmt = prepareQuery("
         DELETE FROM `friendship`
@@ -186,6 +223,11 @@ function removeFriendship($userID) {
     return $stmt->execute();
 }
 
+/**
+ * Sets the friendship between current and target user to accepted.
+ * @param $userID
+ * @return bool
+ */
 function acceptFriendship($userID) {
     $stmt = prepareQuery("
         UPDATE `friendship`
@@ -201,6 +243,11 @@ function acceptFriendship($userID) {
     return $stmt->execute();
 }
 
+/**
+ * Sets the last time the user visited the chat with specified friend.
+ * @param $friend
+ * @return PDOStatement
+ */
 function setLastVisited($friend) {
     $stmt = prepareQuery("
         UPDATE
@@ -231,17 +278,25 @@ function setLastVisited($friend) {
     return $stmt;
 }
 
+/**
+ * Searches m friends from n filtered by search.
+ * @param $n
+ * @param $m
+ * @param $search
+ * @return string
+ */
 function searchSomeFriends($n, $m, $search) {
     $stmt = prepareQuery("
     SELECT
             `userID`,
+            LEFT(`username`, 12) as `usernameshort`,
             `username`,
-            LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 15) as `fullname`,
+            LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 12) as `fullname`,
             IFNULL(
                 `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`,
@@ -276,3 +331,39 @@ function searchSomeFriends($n, $m, $search) {
     $stmt->execute();
     return json_encode($stmt->fetchAll());
 }
+
+/**
+ * Counts all friends of current user filtered by search.
+ * @param $search
+ * @return string
+ */
+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();
+}

website/queries/groupAdmin.php

@@ -0,0 +1,192 @@
+<?php
+/**
+ * Gets the current settings for a group.
+ * @param int $groupID
+ * @return mixed
+ */
+function getGroupSettings(int $groupID) {
+    $stmt = prepareQuery("
+    SELECT
+        `name`,
+        `picture`,
+        `description`
+    FROM
+        `group_page`
+    WHERE
+        `groupID` = :groupID
+    ");
+    $stmt->bindParam(":groupID", $groupID);
+    $stmt->execute();
+    return $stmt->fetch();
+}
+
+/**
+ * Updates the settings for a group.
+ * @param int $groupID
+ * @throws AngryAlert
+ * @throws HappyAlert
+ */
+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");
+    }
+}
+
+/**
+ * Checks if a user is an admin for a page.
+ * @param int $groupID
+ * @param int $userID
+ * @return bool
+ */
+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");
+}
+
+/**
+ * Returns all normal members for a group.
+ * @param int $groupID
+ * @return array|bool
+ */
+function getAllGroupUsers(int $groupID) {
+    return getAllGroupMembers($groupID, 'member');
+}
+
+/**
+ * Returns all admin for a group.
+ * @param int $groupID
+ * @return array|bool
+ */
+function getAllGroupAdmins(int $groupID) {
+    return getAllGroupMembers($groupID, 'admin');
+}
+
+/**
+ * Returns all Moderators for a group.
+ * @param int $groupID
+ * @return array|bool
+ */
+function getAllGroupMods(int $groupID) {
+    return getAllGroupMembers($groupID, 'mod');
+}
+
+/**
+ * Returns all members for a group specified by a string.
+ * @param int $groupID
+ * @param string $role
+ * @return array|bool
+ */
+function getAllGroupMembers(int $groupID, string $role) {
+    $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` = :role
+    ");
+
+    $stmt->bindParam(':groupID', $groupID);
+    $stmt->bindParam(":role", $role);
+    if (!$stmt->execute()) {
+        return False;
+    }
+    return $stmt->fetchAll();
+}
+
+/**
+ * Upgrades or downgrades a groupmember to a different role.
+ * @param int $groupID
+ * @param int $userID
+ * @param string $role
+ * @throws AngryAlert
+ * @throws HappyAlert
+ */
+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");
+    }
+}
+
+/**
+ * Removes a group form the database.
+ * @throws AngryAlert
+ * @throws HappyAlert
+ */
+function deleteGroup() {
+    if (!checkGroupAdmin($_POST["groupID"], $_SESSION["userID"])) {
+        throw new AngryAlert("Geen toestemming om de groep te verwijderen!");
+    }
+    $stmt = prepareQuery("
+    DELETE FROM
+        `group_page`
+    WHERE
+        `groupID` = :groupID
+    ");
+    $stmt->bindValue(":groupID", $_POST["groupID"]);
+    $stmt->execute();
+    if ($stmt->rowCount()) {
+        throw new HappyAlert("Group verwijderd!");
+    } else {
+        throw new AngryAlert("Er is iets mis gegaan");
+    }
+}

website/queries/group_member.php

@@ -1,9 +1,20 @@
 <?php
 
+/**
+ * Returns all groups a user is member of.
+ * @param $userID
+ * @return string
+ */
 function selectAllGroupsFromUser($userID) {
     return selectLimitedGroupsFromUser($userID, 9999);
 }
 
+/**
+ * Selects number of groups that a user is member of.
+ * @param $userID
+ * @param $limit
+ * @return string
+ */
 function selectLimitedGroupsFromUser($userID, $limit) {
     $stmt = prepareQuery("
     SELECT
@@ -27,6 +38,13 @@ function selectLimitedGroupsFromUser($userID, $limit) {
     return json_encode($stmt->fetchAll());
 }
 
+/**
+ * Returns m groups offset by n filtered by search that the current user is part of.
+ * @param $n
+ * @param $m
+ * @param $search
+ * @return string
+ */
 function searchSomeOwnGroups($n, $m, $search) {
     $stmt = prepareQuery("
     SELECT
@@ -55,6 +73,41 @@ function searchSomeOwnGroups($n, $m, $search) {
     return json_encode($stmt->fetchAll());
 }
 
+/**
+ * Counts all groups filtered by search that the current user is member of.
+ * @param $search
+ * @return string
+ */
+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();
+}
+
+/**
+ * Adds a user by userID to a group by groupID with a specified role.
+ * @param $groupID
+ * @param $userID
+ * @param $role
+ * @return bool
+ */
 function addMember($groupID, $userID, $role) {
     $stmt = prepareQuery("
     INSERT INTO
@@ -69,6 +122,13 @@ function addMember($groupID, $userID, $role) {
     return $stmt->execute();
 }
 
+/**
+ * Changes te role of a user within a group to the specified one.
+ * @param $groupID
+ * @param $userID
+ * @param $role
+ * @return bool
+ */
 function changeMember($groupID, $userID, $role) {
     $stmt = prepareQuery("
     UPDATE
@@ -86,6 +146,12 @@ function changeMember($groupID, $userID, $role) {
     return $stmt->execute();
 }
 
+/**
+ * Removes a user from a group.
+ * @param $groupID
+ * @param $userID
+ * @return bool
+ */
 function deleteMember($groupID, $userID) {
     $stmt = prepareQuery("
     DELETE FROM

website/queries/group_page.php

@@ -2,6 +2,10 @@
 
 require_once("connect.php");
 
+/**
+ * Selects some info from a group by name.
+ * @return bool|mixed
+ */
 function selectGroupByName($name) {
     $stmt = prepareQuery("
         SELECT
@@ -33,9 +37,19 @@ function selectGroupByName($name) {
     if (!$stmt->execute()) {
         return False;
     }
-    return $stmt->fetch();
+    $row = $stmt->fetch();
+    if($row["groupID"] == null) {
+        return False;
+    }
+
+    return $row;
 }
 
+/**
+ * Selects the current user's role within a group by the group's ID.
+ * @param int $groupID
+ * @return bool|string
+ */
 function selectGroupRole(int $groupID) {
     $stmt = prepareQuery("
         SELECT
@@ -58,6 +72,11 @@ function selectGroupRole(int $groupID) {
     return $stmt->fetch()["role"];
 }
 
+/**
+ * Returns the status of a group by it's ID.
+ * @param int $groupID
+ * @return bool
+ */
 function selectGroupStatus(int $groupID) {
     $stmt = prepareQuery("
         SELECT
@@ -75,13 +94,21 @@ function selectGroupStatus(int $groupID) {
     return $stmt->fetch()["status"];
 }
 
+/**
+ * Returns some info of all group members.
+ * @param int $groupID
+ * @return bool|PDOStatement
+ */
 function selectGroupMembers(int $groupID) {
     $stmt = prepareQuery("
         SELECT
           `username`,
           `fname`,
           `lname`,
-          `profilepicture`
+          IFNULL(
+                `profilepicture`,
+                '../img/avatar-standard.png'
+            ) AS profilepicture
         FROM
           `group_member`
         LEFT JOIN
@@ -97,9 +124,14 @@ function selectGroupMembers(int $groupID) {
     if (!$stmt->execute()) {
         return False;
     }
-    return $stmt->fetchAll();
+    return $stmt;
 }
 
+/**
+ * Returns group info by it's ID.
+ * @param $groupID
+ * @return PDOStatement
+ */
 function selectGroupById($groupID) {
     $q = prepareQuery("
     SELECT
@@ -119,6 +151,11 @@ function selectGroupById($groupID) {
     return $q;
 }
 
+/**
+ * Returns some info of 20 groups offset by n.
+ * @param $n
+ * @return PDOStatement
+ */
 function select20GroupsFromN($n) {
     $q = prepareQuery("
     SELECT
@@ -141,6 +178,12 @@ function select20GroupsFromN($n) {
     return $q;
 }
 
+/**
+ * Returns info of 20 groups offset by n, filtered by status.
+ * @param $n
+ * @param $status
+ * @return PDOStatement
+ */
 function select20GroupsByStatusFromN($n, $status) {
     $q = prepareQuery("
     SELECT
@@ -166,6 +209,13 @@ function select20GroupsByStatusFromN($n, $status) {
     return $q;
 }
 
+/**
+ * Returns info of 20 groups offset by n, filtered by status, filtered by search.
+ * @param $n
+ * @param $keyword
+ * @param $status
+ * @return PDOStatement
+ */
 function search20GroupsFromNByStatus($n, $keyword, $status) {
     $q = prepareQuery("
     SELECT
@@ -193,6 +243,14 @@ function search20GroupsFromNByStatus($n, $keyword, $status) {
     return $q;
 }
 
+/**
+ * Returns info of n groups offset by m, filtered by status and search.
+ * @param $n
+ * @param $m
+ * @param $search
+ * @param $status
+ * @return PDOStatement
+ */
 function searchSomeGroupsByStatus($n, $m, $search, $status) {
 //    parentheses not needed in where clause, for clarity as
 //      role search should override status filter.
@@ -225,6 +283,12 @@ function searchSomeGroupsByStatus($n, $m, $search, $status) {
     return $q;
 }
 
+/**
+ * Count all groups filtered by status and search.
+ * @param $search
+ * @param $status
+ * @return PDOStatement
+ */
 function countSomeGroupsByStatus($search, $status) {
     $q = prepareQuery("
     SELECT
@@ -248,6 +312,12 @@ function countSomeGroupsByStatus($search, $status) {
     return $q;
 }
 
+/**
+ * Changes the status of a group with the given ID.
+ * @param $id
+ * @param $status
+ * @return PDOStatement
+ */
 function changeGroupStatusByID($id, $status) {
     $q = prepareQuery("
     UPDATE
@@ -264,6 +334,12 @@ function changeGroupStatusByID($id, $status) {
     return $q;
 }
 
+/**
+ * Changes the status of multiple groups to 1 status by an array of IDs.
+ * @param $ids
+ * @param $status
+ * @return PDOStatement
+ */
 function changeMultipleGroupStatusByID($ids, $status) {
     $q = prepareQuery("
     UPDATE
@@ -281,6 +357,13 @@ function changeMultipleGroupStatusByID($ids, $status) {
     return $q;
 }
 
+/**
+ * Returns m groups offset by n, filtered by search.
+ * @param $n
+ * @param $m
+ * @param $search
+ * @return string
+ */
 function searchSomeGroups($n, $m, $search) {
     $stmt = prepareQuery("
     SELECT
@@ -304,6 +387,11 @@ function searchSomeGroups($n, $m, $search) {
     return json_encode($stmt->fetchAll());
 }
 
+/**
+ * Counts all group filtered by search.
+ * @param $search
+ * @return PDOStatement
+ */
 function countSomeGroups($search) {
     $stmt = prepareQuery("
     SELECT

website/queries/login.php

@@ -1,5 +1,9 @@
 <?php
 
+/**
+ * Find matching password with the inputted username/emailadress.
+ * @return mixed
+ */
 function getUser() {
     $stmt = prepareQuery("
     SELECT
@@ -33,8 +37,8 @@ function getUserID() {
     return $stmt->fetch(PDO::FETCH_ASSOC);
 }
 
-function validateLogin($username, $password){
+function validateLogin($username, $password, $url){
-    // Empty username or password field
+        // Empty username or password field
     if (empty($username) || empty($password)) {
         throw new loginException("Inloggegevens zijn niet ingevuld");
     }
@@ -44,26 +48,42 @@ function validateLogin($username, $password){
         $userID = getUser()["userID"];
         $role = getUser()["role"];
 
-        // If there's an account, go to the profile page
+        // If there's an account, check if the account is banned, frozen or unconfirmed.
         if(password_verify($psw, $hash)) {
             if ($role == "banned"){
                 echo "<script>
                          window.onload=bannedAlert();
                     </script>";
-            } else if ($role == "frozen"){
+
+            } else if ($role == "frozen") {
                 $_SESSION["userID"] = $userID;
+                if (!isset($url) or $url = "") {
                 echo "<script>
                          window.onload=frozenAlert();
                          window.location.href= 'profile.php';
                     </script>";
+                } else {
+                    echo "<script>
+                         window.onload=frozenAlert();
+                         window.location.href= $url;
+                    </script>";
+                }
+
             } else if ($role == "unconfirmed"){
                 sendConfirmEmail(getUser()["userID"]);
                 echo "<script>
                          window.onload=emailNotConfirmed();
                     </script>";
+
             } else {
                 $_SESSION["userID"] = $userID;
-                header("location: profile.php");
+                if(!isset($url) or $url == "") {
+                    header("location: profile.php");
+                    echo "succes";
+                } else{
+                    header("location: ".$url);
+                }
+
             }
         } else {
             throw new loginException("Inloggevens zijn niet correct");

website/queries/nicetime.php

@@ -1,9 +1,16 @@
 <?php
+
+/**
+ * Return a relative dutch and readable text when given a datetime.
+ * @param $date
+ * @return string
+ */
 function nicetime($date) {
     if(empty($date)) {
         return "No date provided";
     }
 
+    // Create dutch arrays so it has dutch words.
     $single_periods = array("seconde", "minuut", "uur", "dag", "week", "maand", "jaar", "decennium");
     $multiple_periods = array("seconden", "minuten", "uur", "dagen", "weken", "maanden", "jaar", "decennia");
     $lengths = array("60", "60", "24", "7", "4.35", "12", "10", "0");
@@ -15,7 +22,8 @@ function nicetime($date) {
         return "Bad date";
     }
 
-    if($now > $unix_date) {
+    // Check if it is in the future or not.
+    if($now >= $unix_date) {
         $difference = $now - $unix_date;
         $tense = "geleden";
     } else {
@@ -23,6 +31,7 @@ function nicetime($date) {
         $tense = "vanaf nu";
     }
 
+    // Get the nice time.
     for($i = 0; $difference >= $lengths[$i] && $i < count($lengths) - 1; $i++) {
         $difference /= $lengths[$i];
     }

website/queries/picture.php

@@ -6,7 +6,10 @@
  * @throws AngryAlert
  * @throws HappyAlert
  */
-function updateAvatar(bool $group = false) {
+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/";
@@ -16,17 +19,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";
+        $relativePath = $group ? $avatarDir . $group . "_avatar.gif"  : $avatarDir . $_SESSION["userID"] . "_avatar.gif";
-        $group ? removeOldGroupAvatar($_POST["groupID"]) : removeOldUserAvatar();
+        $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.");
 }
 

website/queries/post.php

@@ -2,6 +2,12 @@
 
 require_once("connect.php");
 
+/**
+ * Select all posts on a user.
+ * @param $userID
+ * @param $groupID
+ * @return bool|PDOStatement
+ */
 function selectAllPosts($userID, $groupID) {
     $stmt = prepareQuery("
         SELECT
@@ -46,6 +52,14 @@ function selectAllPosts($userID, $groupID) {
 
 }
 
+/**
+ * Select $limit posts from $offset from a user or group.
+ * @param $userID
+ * @param $groupID
+ * @param $offset
+ * @param $limit
+ * @return bool|PDOStatement
+ */
 function selectSomePosts($userID, $groupID, $offset, $limit) {
     $stmt = prepareQuery("
         SELECT
@@ -94,9 +108,13 @@ function selectSomePosts($userID, $groupID, $offset, $limit) {
         return False;
     }
     return $stmt;
-
 }
 
+/**
+ * Select all the post information from an postID.
+ * @param $postID
+ * @return PDOStatement
+ */
 function selectPostById($postID) {
     $stmt = prepareQuery("
         SELECT
@@ -122,6 +140,11 @@ function selectPostById($postID) {
     return $stmt;
 }
 
+/**
+ * Get all the comments from a post.
+ * @param $postID
+ * @return PDOStatement
+ */
 function selectCommentsByPostId($postID) {
     $stmt = prepareQuery("
         SELECT
@@ -148,6 +171,13 @@ function selectCommentsByPostId($postID) {
     return $stmt;
 }
 
+/**
+ * Insert a post to a group or user
+ * @param $userID
+ * @param $groupID
+ * @param $title
+ * @param $content
+ */
 function makePost($userID, $groupID, $title, $content) {
     $stmt = prepareQuery("
         INSERT INTO
@@ -172,6 +202,13 @@ function makePost($userID, $groupID, $title, $content) {
     $stmt->execute();
 }
 
+/**
+ * Insert a comment by a post.
+ * @param $postID
+ * @param $userID
+ * @param $content
+ * @return int
+ */
 function makeComment($postID, $userID, $content) : int {
     $stmt = prepareQuery("
         INSERT INTO
@@ -194,6 +231,12 @@ function makeComment($postID, $userID, $content) : int {
     return $stmt->rowCount();
 }
 
+/**
+ * If a post already is niet slechted.
+ * @param int $postID
+ * @param int $userID
+ * @return int
+ */
 function makeNietSlecht(int $postID, int $userID) : int {
     if (checkNietSlecht($postID, $userID)) {
         return deleteNietSlecht($postID, $userID);
@@ -202,6 +245,12 @@ function makeNietSlecht(int $postID, int $userID) : int {
     }
 }
 
+/**
+ * Toggle a niet slecht of a post.
+ * @param int $postID
+ * @param int $userID
+ * @return int
+ */
 function checkNietSlecht(int $postID, int $userID) {
     $stmt = prepareQuery("
     SELECT
@@ -218,6 +267,12 @@ function checkNietSlecht(int $postID, int $userID) {
     return $stmt->rowCount();
 }
 
+/**
+ * Add a niet slecht to a post.
+ * @param int $postID
+ * @param int $userID
+ * @return int
+ */
 function addNietSlecht(int $postID, int $userID) {
     $stmt = prepareQuery("
     INSERT INTO
@@ -230,6 +285,12 @@ function addNietSlecht(int $postID, int $userID) {
     return $stmt->rowCount();
 }
 
+/**
+ * Delete a niet slecht.
+ * @param int $postID
+ * @param int $userID
+ * @return int
+ */
 function deleteNietSlecht(int $postID, int $userID) {
     $stmt = prepareQuery("
     DELETE FROM
@@ -244,6 +305,11 @@ function deleteNietSlecht(int $postID, int $userID) {
     return $stmt->rowCount();
 }
 
+/**
+ * Delete a post
+ * @param int $postID
+ * @param int $userID
+ */
 function deletePost(int $postID, int $userID) {
     if (checkPermissionOnPost($postID, $userID)) {
         $stmt = prepareQuery("
@@ -257,6 +323,12 @@ function deletePost(int $postID, int $userID) {
     }
 }
 
+/**
+ * Check if a user has premissions to delete a post.
+ * @param int $postID
+ * @param int $userID
+ * @return bool
+ */
 function checkPermissionOnPost(int $postID, int $userID) : bool {
     $getGroupID = prepareQuery("
     SELECT
@@ -281,6 +353,12 @@ function checkPermissionOnPost(int $postID, int $userID) : bool {
     }
 }
 
+/**
+ * Returns role of a user.
+ * @param int $userID
+ * @param int $groupID
+ * @return mixed role of a user.
+ */
 function getRoleInGroup(int $userID, int $groupID) {
     $stmt = prepareQuery("
     SELECT

website/queries/private_message.php

@@ -1,23 +1,33 @@
 <?php
 
+/**
+ * Get the the last 100 chat messages.
+ * @param $user2ID
+ * @return string
+ */
 function getOldChatMessages($user2ID) {
     require_once ("friendship.php");
     $user1ID = $_SESSION["userID"];
     if (getFriendshipStatus($user2ID) == 1) {
         $stmt = prepareQuery("
         SELECT
-            *
+          *
         FROM
-            `private_message`
+            (SELECT
-        WHERE
+                *
-            `origin` = :user1 AND 
+            FROM
-            `destination` = :user2 OR 
+                `private_message`
-            `origin` = :user2 AND
+            WHERE
-            `destination` = :user1
+                `origin` = :user1 AND 
+                `destination` = :user2 OR 
+                `origin` = :user2 AND
+                `destination` = :user1
+            ORDER BY
+                `messageID` DESC
+            LIMIT
+              100) sub
         ORDER BY
-            `creationdate` ASC
+            `messageID` ASC
-        LIMIT
-          100
         ");
 
         $stmt->bindParam(":user1", $user1ID);
@@ -31,6 +41,12 @@ function getOldChatMessages($user2ID) {
     }
 }
 
+/**
+ * Send a chat message.
+ * @param $destination
+ * @param $content
+ * @return bool
+ */
 function sendMessage($destination, $content) {
     require_once("friendship.php");
     if (getFriendshipStatus($destination) == 1) {
@@ -60,6 +76,12 @@ function sendMessage($destination, $content) {
     }
 }
 
+/**
+ * Get all the chat messages after an messageID ($lastID).
+ * @param $lastID
+ * @param $destination
+ * @return string
+ */
 function getNewChatMessages($lastID, $destination) {
     require_once("friendship.php");
     if (getFriendshipStatus($destination) == 1) {
@@ -76,7 +98,7 @@ function getNewChatMessages($lastID, $destination) {
             `destination` = :user1) AND
             `messageID` > :lastID
         ORDER BY
-            `creationdate` ASC
+            `messageID` ASC
         ");
 
         $stmt->bindParam(':user1', $_SESSION["userID"]);
@@ -91,11 +113,14 @@ function getNewChatMessages($lastID, $destination) {
     }
 }
 
-
+/**
+ * Get of every friend the first unread chat message.
+ * @return string
+ */
 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`,

website/queries/settings.php

@@ -16,9 +16,13 @@ function getSettings() {
       `location`,
       `birthdate`,
       `bio`,
-      `profilepicture`,
+      IFNULL(
+                `profilepicture`,
+                '../img/avatar-standard.png'
+            ) AS profilepicture,
       `showBday`,
-      `showEmail`
+      `showEmail`,
+      `showProfile`
     FROM
       `user`
     WHERE
@@ -49,6 +53,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
@@ -64,7 +77,8 @@ function updateSettings() {
       `birthdate` = :bday,
       `bio` = :bio,
       `showEmail` = :showEmail,
-      `showBday` = :showBday
+      `showBday` = :showBday,
+      `showProfile` = :showProfile
     WHERE
       `userID` = :userID
     ");
@@ -79,6 +93,7 @@ function updateSettings() {
     $stmt->bindValue(":bio", test_input($_POST["bio"]));
     $stmt->bindValue(":showEmail", (array_key_exists("showEmail", $_POST) ? "1" : "0"));
     $stmt->bindValue(":showBday", (array_key_exists("showBday", $_POST) ? "1" : "0"));
+    $stmt->bindValue(":showProfile", (array_key_exists("showProfile", $_POST) ? "1" : "0"));
 
     $stmt->bindValue(":userID", $_SESSION["userID"]);
     $stmt->execute();
@@ -136,6 +151,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"])) {
@@ -152,6 +171,11 @@ function changeEmail() {
     }
 }
 
+/**
+ * Checks if an emailadres is available in the database.
+ * @param $email
+ * @throws AngryAlert
+ */
 function emailIsAvailableInDatabase($email) {
     $stmt = prepareQuery("
     SELECT
@@ -169,6 +193,12 @@ function emailIsAvailableInDatabase($email) {
     }
 }
 
+/**
+ * Does the actual changing of an email-adress.
+ * @param $email
+ * @throws AngryAlert
+ * @throws HappyAlert
+ */
 function doChangeEmail($email) {
     $stmt = prepareQuery("
     UPDATE

website/queries/user.php

@@ -2,6 +2,10 @@
 
 require_once ("connect.php");
 
+/**
+ * This sets the last activity of the session user to now.
+ * @return bool, true is it ran correctly
+ */
 function updateLastActivity() {
     $stmt = prepareQuery("
       UPDATE
@@ -15,6 +19,11 @@ function updateLastActivity() {
     return $stmt->execute();
 }
 
+/**
+ * This gets the userID from a username
+ * @param $username
+ * @return mixed
+ */
 function getUserID($username) {
     $stmt = prepareQuery("
         SELECT
@@ -30,6 +39,11 @@ function getUserID($username) {
     return $stmt->fetch()["userID"];
 }
 
+/**
+ * This gets the username from a userID
+ * @param $userID
+ * @return mixed
+ */
 function getUsername($userID) {
     $stmt = prepareQuery("
         SELECT
@@ -45,6 +59,12 @@ function getUsername($userID) {
     return $stmt->fetch()["username"];
 }
 
+/**
+ * This selects the information about the other user and the connection between the two.
+ * @param $me
+ * @param $other
+ * @return bool|mixed
+ */
 function selectUser($me, $other) {
     $stmt = prepareQuery("
         SELECT
@@ -52,19 +72,27 @@ function selectUser($me, $other) {
           `username`,
           `birthdate`,
           `location`,
+          `showBday`,
+          `showEmail`,
+          `showProfile`,
+          `email`,
           IFNULL(
                 `profilepicture`,
                 '../img/avatar-standard.png'
             ) 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`,
           `role`,
           `fname`,
           `lname`,
+          `showBday`,
+          `showEmail`,
+          `showProfile`,
+          `status`,
           CASE `status` IS NULL
             WHEN TRUE THEN 0
             WHEN FALSE THEN
@@ -93,10 +121,17 @@ 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();
 }
 
+/**
+ * Select all the users from a group.
+ * @param $userID
+ * @return PDOStatement
+ */
 function selectAllUserGroups($userID) {
     $stmt = prepareQuery("
         SELECT
@@ -112,7 +147,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);
@@ -120,6 +155,11 @@ function selectAllUserGroups($userID) {
     return $stmt;
 }
 
+/**
+ * Selects 20 users from a given point in the table, ordered by role and name
+ * @param $n
+ * @return PDOStatement
+ */
 function select20UsersFromN($n) {
     $q = prepareQuery("
     SELECT
@@ -127,7 +167,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`
@@ -145,6 +185,12 @@ function select20UsersFromN($n) {
     return $q;
 }
 
+/**
+ * Search 20 users from a given point in the table, ordered by role and name
+ * @param $n
+ * @param $keyword
+ * @return PDOStatement
+ */
 function search20UsersFromN($n, $keyword) {
     $q = prepareQuery("
     SELECT
@@ -152,7 +198,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`
@@ -173,6 +219,13 @@ function search20UsersFromN($n, $keyword) {
     return $q;
 }
 
+/**
+ * Search 20 users from a given point in the database where the status @param $status
+ * @param $n
+ * @param $keyword
+ * @param $status
+ * @return PDOStatement
+ */
 function search20UsersFromNByStatus($n, $keyword, $status) {
     $q = prepareQuery("
     SELECT
@@ -180,7 +233,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`
@@ -205,6 +258,14 @@ function search20UsersFromNByStatus($n, $keyword, $status) {
     return $q;
 }
 
+/**
+ * Search users from a given point in the database where the status @param $status
+ * @param $n
+ * @param $m
+ * @param $search
+ * @param $status
+ * @return PDOStatement
+ */
 function searchSomeUsersByStatus($n, $m, $search, $status) {
 //    parentheses not needed in where clause, for clarity as
 //      role search should override status filter.
@@ -214,7 +275,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`
@@ -242,6 +303,12 @@ function searchSomeUsersByStatus($n, $m, $search, $status) {
     return $q;
 }
 
+/**
+ * Count the users with a name like $search and a $status
+ * @param $search
+ * @param $status
+ * @return PDOStatement
+ */
 function countSomeUsersByStatus($search, $status) {
     $q = prepareQuery("
     SELECT
@@ -266,7 +333,12 @@ function countSomeUsersByStatus($search, $status) {
     return $q;
 }
 
-
+/**
+ * Change the user status
+ * @param $id
+ * @param $status
+ * @return PDOStatement
+ */
 function changeUserStatusByID($id, $status) {
     $q = prepareQuery("
     UPDATE
@@ -283,6 +355,12 @@ function changeUserStatusByID($id, $status) {
     return $q;
 }
 
+/**
+ * Change multiple user statuses by an id array.
+ * @param $ids
+ * @param $status
+ * @return PDOStatement
+ */
 function changeMultipleUserStatusByID($ids, $status) {
     $q = prepareQuery("
     UPDATE
@@ -300,6 +378,13 @@ function changeMultipleUserStatusByID($ids, $status) {
     return $q;
 }
 
+/**
+ * Change multiple user statuses by an id array.
+ * This excludes that admins and owners statuses can be changed.
+ * @param $ids
+ * @param $status
+ * @return PDOStatement
+ */
 function changeMultipleUserStatusByIDAdmin($ids, $status) {
     $q = prepareQuery("
     UPDATE
@@ -319,6 +404,11 @@ function changeMultipleUserStatusByIDAdmin($ids, $status) {
     return $q;
 }
 
+/**
+ * Select a random user that is nog your friend.
+ * @param $userID
+ * @return mixed
+ */
 function selectRandomNotFriendUser($userID) {
     $stmt = prepareQuery("
     SELECT
@@ -347,17 +437,25 @@ function selectRandomNotFriendUser($userID) {
     return $stmt->fetch();
 }
 
+/**
+ * Search users.
+ * @param $n
+ * @param $m
+ * @param $search
+ * @return string
+ */
 function searchSomeUsers($n, $m, $search) {
     $stmt = prepareQuery("
     SELECT
         `userID`,
+        LEFT(`username`, 12) as `usernameshort`,
         `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)
+        CASE `lastactivity` >= DATE_SUB(NOW(),INTERVAL 5 MINUTE)
           WHEN TRUE THEN 'online'
           WHEN FALSE THEN 'offline'
         END AS `onlinestatus`
@@ -386,6 +484,11 @@ function searchSomeUsers($n, $m, $search) {
     return json_encode($stmt->fetchAll());
 }
 
+/**
+ * Count the users that you get searching for a user with a keyword.
+ * @param $search
+ * @return PDOStatement
+ */
 function countSomeUsers($search) {
     $q = prepareQuery("
     SELECT
@@ -409,6 +512,11 @@ function countSomeUsers($search) {
         return $q;
 }
 
+/**
+ * Get the role of a user by userID.
+ * @param $userID
+ * @return mixed
+ */
 function getRoleByID($userID) {
     $stmt = prepareQuery("
         SELECT
@@ -424,6 +532,11 @@ function getRoleByID($userID) {
     return $stmt->fetch()["role"];
 }
 
+/**
+ * Edit the ban comment.
+ * @param $userID
+ * @param $comment
+ */
 function editBanCommentByID($userID, $comment) {
     $stmt = prepareQuery("
         UPDATE

website/views/adminpanel-grouptable.php

@@ -1,9 +1,9 @@
 <tr>
     <th><input class="table-checkbox" type="checkbox" id="checkall" name="checkall" onchange="checkAll(this)"></th>
-    <th class="table-username">Gebruikersnaam</th>
+    <th class="table-username">Groepsnaam</th>
     <th class="table-status">Status</th>
-    <th class="table-comment">Aantekening</th>
+    <th class="table-comment">Beschrijving</th>
-    <th class="table-action">Actie</th>
+    <th class="table-action">Zichtbaarheid</th>
 </tr>
 
 <?php
@@ -33,9 +33,9 @@ while ($group = $q->fetch(PDO::FETCH_ASSOC)) {
                 <form class='admin-groupaction'
                       onsubmit=\"adminUpdate(this);  return false;\">
                     <select class='action' name='actions'>
-                        <option value='hidden'>Hidden</option>
+                        <option value='hidden'>Verborgen</option>
-                        <option value='public'>Public</option>
+                        <option value='public'>Publiek</option>
-                        <option value='membersonly'>Members</option>
+                        <option value='membersonly'>Alleen Leden</option>
                     </select>
                     <input type='hidden' name='groupID' value='$groupID'>
                     <input type='submit' value='Confirm'>

website/views/adminpanel-page.php

@@ -13,6 +13,7 @@ Pagina:
         id="currentpage"
         form="admin-searchform"
         onchange="adminSearch();">
+<!--  Construct the options.  -->
     <?php
     for ($i=1; $i <= ceil($countresults / $entries); $i++) {
         if ($currentpage == $i) {

website/views/adminpanel-table.php

@@ -1,5 +1,5 @@
 <tr>
-    <th><input class="table-checkbox" type="checkbox" id="checkall" name="checkall" onchange="checkAll()"></th>
+    <th class="table-checkbox"><input class="table-checkbox" type="checkbox" id="checkall" name="checkall" onchange="checkAll()"></th>
     <th class="table-username">Gebruikersnaam</th>
     <th class="table-status">Status</th>
     <th class="table-comment">Aantekening</th>
@@ -55,7 +55,8 @@ while($user = $q->fetch(PDO::FETCH_ASSOC)) {
                               OR $user['role'] == 'owner'))) {
                             echo "<option value='frozen'>Bevries</option>
                                   <option value='banned'>Ban</option>
-                                  <option value='user'>Activeer</option>";
+                                  <option value='user'>Activeer</option>
+                                  <option value='unconfirmed'>Ongevalideerd</option>";
 
                             if ($userinfo == 'owner') {
                                 echo "<option value='admin'>Admin</option>

website/views/adminpanel.php

@@ -1,5 +1,4 @@
-
+<!-- Form value holding. -->
-<!-- function test_input taken from http://www.w3schools.com/php/php_form_validation.asp -->
 <?php
 $search = "";
 $status = array("user", "frozen", "banned", "unconfirmed", "admin", "owner");
@@ -67,13 +66,13 @@ if (isset($_GET["groupstatus"])) {
                            id="frozen"
                            value="frozen"
                         <?php if (in_array("frozen", $status)) echo "checked";?>>
-                    <label for="frozen">Gefrozen</label><br>
+                    <label for="frozen">Bevroren</label><br>
                     <input type="checkbox"
                            name="status[]"
                            id="banned"
                            value="banned"
                         <?php if (in_array("banned", $status)) echo "checked";?>>
-                    <label for="banned">Gebant</label><br>
+                    <label for="banned">Verbannen</label><br>
                     <input type="checkbox"
                            name="status[]"
                            id="admin"
@@ -91,7 +90,7 @@ if (isset($_GET["groupstatus"])) {
                            id="owner"
                            value="owner"
                         <?php if (in_array("owner", $status)) echo "checked";?>>
-                    <label for="owner">Owner</label>
+                    <label for="owner">Eigenaar</label>
                 </div>
 
                 <div id="admin-groupfilter">
@@ -122,16 +121,17 @@ if (isset($_GET["groupstatus"])) {
                     <button type="submit" name="batchactions" id="freeze" value="frozen">Bevries</button>
                     <button type="submit" name="batchactions" id="ban" value="banned">Ban</button>
                     <button type="submit" name="batchactions" id="restore" value="user">Activeer</button>
+                    <button type="submit" name="batchactions" id="unconfirm" value="unconfirmed">Maak Ongevalideerd</button>
                     <?php
                     if ($userinfo == 'owner') {
                         echo "<button type=\"submit\" 
                                       name=\"batchactions\" 
-                                      id=\"admin\" 
+                                      id=\"batch-admin\" 
                                       value=\"admin\">Maak Admin</button>
                               <button type=\"submit\" 
                                       name=\"batchactions\" 
-                                      id=\"owner\" 
+                                      id=\"batch-owner\" 
-                                      value=\"owner\">Maak Owner</button>";
+                                      value=\"owner\">Maak Eigenaar</button>";
                     }
                     ?>
                 </form>
@@ -139,9 +139,9 @@ if (isset($_GET["groupstatus"])) {
                       onsubmit="adminUpdate(this);  return false;">
 
                     <input type="hidden" name="groupbatchactions" id="groupbatchinput">
-                    <button type="submit" name="batchactions" id="hide" value="hidden">Hide</button>
+                    <button type="submit" name="batchactions" id="batch-hide" value="hidden">Verborgen</button>
-                    <button type="submit" name="batchactions" id="ban" value="public">Public</button>
+                    <button type="submit" name="batchactions" id="batch-public" value="public">Publiek</button>
-                    <button type="submit" name="batchactions" id="members" value="membersonly">Members</button>
+                    <button type="submit" name="batchactions" id="batch-members" value="membersonly">Alleen Leden</button>
                 </form>
             </div>
 
@@ -151,5 +151,3 @@ if (isset($_GET["groupstatus"])) {
         </div>
     </div>
 </div>
-</body>
-</html>

website/views/createGroup.php

@@ -0,0 +1,42 @@
+<?php
+?>
+
+<div class="content">
+    <div class="createGroup">
+        <form class="platform settings" method="post" action="createGroup.php" enctype="multipart/form-data">
+            <h5>Maak een groep!</h5>
+            <ul>
+                <li>
+                    <label for="groupName">Groepsnaam</label>
+                    <input type="text"
+                           name="groupName"
+                           id="groupName"
+                           maxlength="63"
+                           placeholder="Groepsnaam"
+                    >
+                </li>
+                <li>
+                    <label for="bio">Bio</label>
+                    <textarea name="bio"
+                              rows="5"
+                              title="bio"
+                              id="bio"
+                              maxlength="1000"
+                    ></textarea>
+                </li>
+                <li>
+                    <label>Selecteer foto</label>
+                    <input type="file"
+                           name="pp"
+                           accept="image/*"
+                           size="4000000"
+                    >
+                </li>
+                <li>
+                    <label></label>
+                    <button type="submit">Maak Groep</button>
+                </li>
+            </ul>
+        </form>
+    </div>
+</div>

website/views/facebookRegisterModal.php

@@ -1,7 +1,6 @@
 <!-- The Modal -->
 <div id="fbModal" class="modal">
     <form action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]);?>"
-          return= $correct
           method="post"
           name="fbModal">
 
@@ -55,7 +54,6 @@
                     *<span class="error"> <?php echo $fbConfirmpasswordErr;?></span>
                 </div>
 
-
                 <?php if(empty($userBday)) { ?>
                 <!-- Register birthday -->
                 <div class="login_containerregister">
@@ -67,17 +65,16 @@
                 </div>
                 <?php } ?>
             </div>
+            <span class="error"> <?php echo $fbEmailErr;?></span>
             <div class="modal-footer">
                 <button type="submit"
                         value="fbRegister"
-                        name="submit"
+                        name="submit">
-                        id="frm1_submit">
                     Registreer account
                 </button>
             </div>
         </div>
-
+        <!-- Facebook information-->
-
         <input type="hidden"
                name="fbName"
                value="<?php echo $fbName ?>">

website/views/forgotPasswordModal.php

@@ -4,7 +4,6 @@
 <!-- The Modal -->
 <div id="myModal" class="modal">
     <form action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]);?>"
-          return= $correct
           method="post"
           name="forgotPassword">
 
@@ -26,8 +25,7 @@
                 <div class="login_containerfault"><span><?php echo $resetErr; ?></span></div>
                 <button type="submit"
                         value="reset"
-                        name="submit"
+                        name="submit">
-                        id="frm1_submit">
                     Reset password
                 </button>
             </div>

website/views/group.php

@@ -1,19 +1,33 @@
 <div class="content">
-    <div class="profile-box platform">
+    <div class="user-box">
-        <img class="left main-picture group-picture" src="<?= $group['picture'] ?>">
+        <img alt="<?= $group["name"] ?>" class="group-picture main-picture" src="<?= $group["picture"] ?>"><br />
-        <div class="group-button-container"></div>
+        <div class="platform">
-        <h1 class="profile-username"><?= $group['name'] ?></h1>
+            <div class="status-buttons-container">
-        <p><?= $group['description'] ?></p>
+                <button disabled class="gray"><?= $group["status"] ?></button>
-
+            </div>
+            <div class="group-button-container"></div>
+            <div class="profile-info">
+                <h2><?= $group["name"]?></h2>
+                <?= $group["description"] ?>
+            </div>
+        </div>
     </div>
-
     <div class="item-box-full-width platform">
         <h2>Leden (<?= $group['members'] ?>)</h2>
         <p>
             <?php
-                foreach($members as $member) {
+                $membercount = $members->rowCount();
+                $memberdif = $membercount - 7;
+
+                for ($i = 0; $i < min($membercount, 7); $i += 1) {
+                    $member = $members->fetch();
                     echo "<a href=\"profile.php?username=" . $member["username"] . "\" data-title=\"" . $member["username"] . "\"><img class=\"profile-picture\" src=\"" . $member["profilepicture"] . "\" alt=\"" . $member["username"] . "'s profielfoto\"></a>";
                 }
+
+                if ($memberdif > 0) {
+                    echo $memberdif === 1 ? "en nog 1 andere." : "...en nog $memberdif anderen.";
+                }
+
             ?>
         </p>
     </div>
@@ -22,6 +36,10 @@
 
     </div>
 
+    <div class="noposts platform">
+        <p>Geen posts meer!</p>
+    </div>
+
     <div class="modal">
         <div class="modal-content platform">
             <div class="modal-close">

website/views/groupAdmin.php

@@ -0,0 +1,168 @@
+<?php
+require_once "../queries/connect.php";
+require_once "../queries/groupAdmin.php";
+require_once "../queries/checkInput.php";
+$groupinfo = getGroupSettings($_GET["groupID"]);
+?>
+<div class="content">
+    <div class="settings">
+        <?php if ($_SERVER["REQUEST_METHOD"] == "POST"): ?>
+        <div class='platform settings-message <?=$alertClass?>'>
+            <?=$alertMessage?>
+        </div>
+        <?php endif; ?>
+        <div class="platform">
+            <ul>
+                <li>
+                    <label></label>
+                    <a href="group.php?groupname=<?=$groupinfo["name"]?>">
+                        <button><i class="fa fa-chevron-left"></i> Terug naar de groep</button>
+                    </a>
+                </li>
+            </ul>
+        </div>
+        <form class="platform" method="post">
+            <h5>Groep Instellingen</h5>
+            <input type="hidden" name="groupID" value="<?=$_GET["groupID"]?>">
+            <ul>
+                <li>
+                    <label for="name">Groepsnaam</label>
+                    <input type="text"
+                           name="name"
+                           id="name"
+                           maxlength="63"
+                           placeholder="Groepsnaam"
+                           title="Groepsnaam"
+                           value="<?=$groupinfo["name"]?>"
+                    >
+                </li>
+                <li>
+                    <label for="bio">Bio</label>
+                    <textarea name="bio"
+                              rows="5"
+                              title="bio"
+                              id="bio"
+                              maxlength="1000"
+                    ><?=$groupinfo["description"]?></textarea>
+                    <label></label>
+                </li>
+                <li>
+                    <label></label>
+                    <button type="submit"
+                            name="form"
+                            value="group"
+                    ><i class="fa fa-save"></i> Opslaan</button>
+                </li>
+            </ul>
+        </form>
+        <form class="platform" method="post" enctype="multipart/form-data">
+            <h5>Verander groepsafbeelding.</h5>
+            <input type="hidden" name="groupID" value="<?=$_GET["groupID"]?>">
+            <ul>
+                <li>
+                    <label>Huidige profielfoto</label>
+                    <img src="<?=$groupinfo["picture"]?>"
+                         class="group-picture"
+                    >
+                </li>
+                <li>
+                    <label>Selecteer foto</label>
+                    <input type="file"
+                           name="pp"
+                           accept="image/*"
+                           size="4000000"
+                           required
+                    >
+                </li>
+                <li>
+                    <label></label>
+                    <button type="submit"
+                            name="form"
+                            value="picture"
+                    ><i class="fa fa-picture-o"></i> Verander profielfoto</button>
+                </li>
+            </ul>
+        </form>
+        <form class="platform" method="post">
+            <h5>Voeg een admin/mod toe</h5>
+            <ul>
+                <il>
+                    <input name="groupID" value="<?=$_GET["groupID"]?>" type="hidden">
+                    <label>Selecteer gebruiker</label>
+                    <select name="userID">
+                        <option disabled selected>Geen gebruiker geselecteerd:</option>
+                        <?php
+                        $groupMembers = getAllGroupUsers($_GET["groupID"]);
+                        foreach ($groupMembers as $groupMember) {?>
+                            <option value="<?=$groupMember["userID"]?>">
+                                <?=$groupMember["fullname"]?> (<?=$groupMember["username"]?>)
+                            </option>
+                        <?php } ?>
+                    </select>
+                    <button name="form"
+                            value="admin"
+                    >
+                        Maak Admin
+                    </button>
+                    <button name="form"
+                            value="mod"
+                    >
+                        Maak Moderator
+                    </button>
+                </il>
+            </ul>
+        </form>
+        <form class="platform" method="post">
+            <h5>Verwijder een admin/mod</h5>
+            <ul>
+                <il>
+                    <input name="groupID" value="<?=$_GET["groupID"]?>" type="hidden">
+                    <label>Selecteer gebruiker</label>
+                    <select name="userID">
+                        <option disabled selected>Geen gebruiker geselecteerd:</option>
+                        <?php
+                        $groupAdmins = getAllGroupAdmins($_GET["groupID"]);
+                        foreach ($groupAdmins as $groupAdmin) {?>
+                            <option value="<?=$groupAdmin["userID"]?>">
+                                <?=$groupAdmin["fullname"]?> (<?=$groupAdmin["username"]?>) (<?=$groupAdmin["role"]?>)
+                            </option>
+                        <?php } ?>
+                        <?php
+                        $groupMods = getAllGroupMods($_GET["groupID"]);
+                        foreach ($groupMods as $groupMod) {?>
+                            <option value="<?=$groupMod["userID"]?>">
+                                <?=$groupMod["fullname"]?> (<?=$groupMod["username"]?>) (<?=$groupMod["role"]?>)
+                            </option>
+                        <?php } ?>
+                    </select>
+                    <button name="form"
+                            value="deadmin"
+                    >
+                        Verwijder
+                    </button>
+                </il>
+            </ul>
+        </form>
+        <form class="platform" method="post">
+            <ul>
+                <h5>Verwijder groep</h5>
+                <li>
+                    <label></label>
+                    <input name="groupID" value="<?=$_GET["groupID"]?>" type="hidden">
+                    <button class="red"
+                            name="form"
+                            value="delete"
+                    ><i class="fa fa-trash"></i> Verwijder groep</button>
+                </li>
+            </ul>
+        </form>
+        <div class="platform">
+            <ul>
+                <li>
+                    <label></label>
+                    <a href="group.php?groupname=<?=$groupinfo["name"]?>"><button><i class="fa fa-chevron-left"></i> Terug naar de groep</button></a>
+                </li>
+            </ul>
+        </div>
+    </div>        
+</div>

website/views/head.php

@@ -1,4 +1,7 @@
-<meta charset="utf-8">
+<meta charset="UTF-8">
+<meta name="description" content="MyHyvesbook+ is het sociaal medium voor alle coole mensen. Stap nu over van facebook op het gloednieuwe en betere sociaal medium.">
+<meta name="keywords" content="MyHyvesbookPlus,Myhyvesbook+,sociaal,media">
+<meta name="author" content="MyHyvesbookplus corporation">
 <title>MyHyvesbook+</title>
 <!-- Add your javascript files here. -->
 <script src="js/jquery.js"></script>
@@ -23,8 +26,8 @@ require_once ("../queries/user.php");
 
 session_start();
 
-if(!isset($_SESSION["userID"])){
+if(!isset($_SESSION["userID"])) {
-    header("location:login.php");
+    header("location:login.php?url=" . "$_SERVER[REQUEST_URI]");
 } else {
     updateLastActivity();
 }

website/views/header.php

@@ -23,9 +23,9 @@ $userinfo = getHeaderInfo();
             <div id="hello-loop">
                 Hallo
             </div>
-            <?=$userinfo["fname"]?>
+            <?= $userinfo["fname"] ?>
         </div>
-        <img id="own-profile-picture" class="profile-picture" src="<?=$userinfo["profilepicture"]?>"/><i id="open-notifications" class="fa fa-bars"></i>
+        <img alt="<?= $userinfo["lname"] ?>" id="own-profile-picture" class="profile-picture" src="<?=$userinfo["profilepicture"]?>"/><i id="open-notifications" class="fa fa-bars"></i>
     </div>
 </header>
 <?php include("notification-center.php"); ?>

website/views/homeLoginRegister.php

@@ -1,19 +1,26 @@
 <?php
+session_start();
+
+// Checks if there's a user already logged in
+if(isset($_SESSION["userID"])){
+    echo "<script>
+                window.onload=checkLoggedIn();
+            </script>";
+}
 
 // Facebook variables
 $appID = "353857824997532";
 $appSecret = "db47e91ffbfd355fdd11b4b65eade851";
-$fbUsername = $fbPassword = $fbConfirmpassword = "";
+$fbUsername = $fbPassword = $fbConfirmpassword = $fbName = $fbSurname = $fbBday = $fbEmail = $fbUserID = "";
 $fbUsernameErr = $fbPasswordErr = $fbConfirmpasswordErr = $fbEmailErr = $fbBdayErr = "";
 $fbCorrect = true;
-$fbName = $fbSurname = $fbBday = $fbEmail = $fbUserID = "";
-$bdayExist = false;
 
 // Register variables
 $name = $surname = $bday = $username = $password = $confirmpassword = $location = $housenumber = $email = $confirmEmail = $captcha = $ip = "";
 $genericErr = $nameErr = $surnameErr = $bdayErr = $usernameErr = $passwordErr = $confirmpasswordErr = $locationErr = $housenumberErr = $emailErr = $confirmEmailErr = $captchaErr = "";
 $correct = true;
 
+// Bday dates
 $day_date = $month_date = $year_date = "";
 $fbDay_date = $fbMonth_date = $fbYear_date = "";
 
@@ -27,7 +34,7 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
         case "login":
             try {
                 $user = ($_POST["user"]);
-                validateLogin($_POST["user"], $_POST["psw"]);
+                validateLogin($_POST["user"], $_POST["psw"], $_POST["url"]);
             } catch(loginException $e) {
                 $loginErr = $e->getMessage();
             }
@@ -46,18 +53,22 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
             }
             break;
         case "register":
-            include("register.php");
+            include("../views/register.php");
             break;
         case "fbRegister":
-            include("fbRegister.php");
+            include("../views/fbRegister.php");
             break;
     }
 }
+
+// Get facebook information with facebook PHP SDK.
 $fb = new Facebook\Facebook([
     'app_id' => $appID,
     'app_secret' => $appSecret,
     'default_graph_version' => 'v2.2',
 ]);
+
+// Redirect back to login.php after logging/canceling with facebook.
 $redirect = "https://myhyvesbookplus.nl/login.php";
 $helper = $fb->getRedirectLoginHelper();
 
@@ -72,6 +83,7 @@ try {
     exit;
 }
 
+// If theres no facebook account logged in, ask for permission.
 if(!isset($acces_token)){
     $permission=["email", "user_birthday"];
     $loginurl=$helper->getLoginUrl($redirect,$permission);
@@ -80,13 +92,14 @@ if(!isset($acces_token)){
     $response = $fb->get('/me?fields=email,name,birthday');
     $usernode = $response->getGraphUser();
 
+    // Get facebook information
     $nameSplit = explode(" ", $usernode->getName());
     $fbName = $nameSplit[0];
     $fbSurname = $nameSplit[1];
     $fbUserID = $usernode->getID();
     $fbEmail = $usernode->getProperty("email");
-//        $image = 'https://graph.facebook.com/' . $usernode->getId() . '/picture?width=200';
 
+    // If there is an account, check if the account is banned or frozen.
     if (fbLogin($fbUserID) == 1) {
         $fbID = getfbUserID($fbUserID)["userID"];
         $fbRole = getfbUserID($fbUserID)["role"];
@@ -94,16 +107,20 @@ if(!isset($acces_token)){
             echo "<script>
                          window.onload=bannedAlert();
                     </script>";
+
         } else if($fbRole == "frozen"){
             $_SESSION["userID"] = $fbID;
             echo "<script>
-                         window.onload=frozenAlert();
+                     window.onload=frozenAlert();
-                         window.location.href= 'profile.php';
+                     window.location.href= 'profile.php';
-                    </script>";
+                  </script>";
+
         } else {
             $_SESSION["userID"] = $fbID;
             header("location: profile.php");
+
         }
+    // Registration with faceobook if theres no account.
     } else {
         echo "<script>
                     window.onload = function() {

website/views/login-view.php

@@ -1,3 +1,9 @@
+<div class="login_containerNoscript">
+    <noscript>
+        <a href="http://www.enable-javascript.com/nl/" target="_blank">Om deze site te gebruiken is het noodzakelijk om Javascript aan te zetten.
+            Klikt hier voor de instructies om je Javascript te activeren</a>.
+    </noscript>
+</div>
 <div>
     <img style="width:50%;margin-left:25%"
          src="/img/top-logo.png"
@@ -7,10 +13,17 @@
     <h1>Welkom bij MyHyvesbook+</h1>
     <!-- Login content  -->
     <form action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]);?>"
-          return=$correct
           method="post"
           name="login">
 
+        <!-- Url parameter  -->
+        <input type="hidden"
+               name="url"
+               value="<?php
+                        if(isset($_GET["url"])) {
+                            echo $_GET["url"];
+                        } ?>"/>
+
         <!-- Login name -->
         <div class="login_containerlogin">
             <label><b>Gebruikersnaam/Email</b></label>
@@ -41,8 +54,7 @@
         <div class="login_containerlogin">
             <button type="submit"
                     value="login"
-                    name="submit"
+                    name="submit">
-                    id="frm1_submit">
             Inloggen
             </button>
         </div>
@@ -62,74 +74,8 @@
 <!--Login with facebook button-->
 <?php
     if(!isset($acces_token)) {
-        echo '<div class="login_containerlogin"><a class="fbButton" href="' . $loginurl . '">login with Facebook!</a></div>';
+        echo '<div class="login_containerlogin"><a class="fbButton" href="' . $loginurl . '"><i class="fa fa-facebook-square"></i> login met Facebook!</a></div>';
+    } else {
+        echo '<div class="login_containerlogin"><a class="fbButton" href="' . "https://myhyvesbookplus.nl/login.php" . '"><i class="fa fa-facebook-square"></i> loguit Facebook sessie</a></div>';
     }
 ?>
-
-<script>
-// Get the modal
-var modal = document.getElementById('myModal');
-var registerModal = document.getElementById('registerModal');
-var facebookModal = document.getElementById("fbModal");
-
-// Get the button that opens the modal
-var registerBtn = document.getElementById("registerBtn");
-var btn = document.getElementById("myBtn");
-
-
-// Get the <span> element that closes the modal
-var span = document.getElementsByClassName("close")[0];
-var registerSpan = document.getElementsByClassName("close")[1];
-var facebookCLose = document.getElementsByClassName("close")[2];
-
-    /**
-     * When the user clicks the button, open the modal
-     */
-    btn.onclick = function () {
-        modal.style.display = "block";
-
-    }
-    registerBtn.onclick = function () {
-        registerModal.style.display = "block";
-    }
-
-    /**
-     * WHen the user clicks on (X), close the modal
-     */
-    span.onclick = function () {
-        modal.style.display = "none";
-    }
-    registerSpan.onclick = function () {
-        registerModal.style.display = "none";
-    }
-    facebookCLose.onclick = function () {
-        facebookModal.style.display = "none";
-    }
-
-    /**
-     * When the user clicks anywhere outside of the modal, close it
-     */
-    window.onclick = function (event) {
-        if (event.target == modal) {
-            modal.style.display = "none";
-        }
-        if (event.target == registerModal) {
-            registerModal.style.display = "none";
-        }
-        if (event.target == facebookModal) {
-            facebookModal.style.display = "none";
-        }
-    }
-
-    /**
-     * When ESC is pressed, close modal
-     */
-    document.addEventListener('keyup', function(e) {
-            if (e.keyCode == 27) {
-                modal.style.display = "none";
-                registerModal.style.display = "none";
-
-            }
-        });
-
-</script>

website/views/login_head.php

@@ -1,5 +1,8 @@
 <head>
-    <meta charset="utf-8">
+    <meta charset="UTF-8">
+    <meta name="description" content="MyHyvesbook+ is het sociaal medium voor alle coole mensen. Stap nu over van facebook op het gloednieuwe en betere sociaal medium.">
+    <meta name="keywords" content="MyHyvesbookPlus,Myhyvesbook+,sociaal,media">
+    <meta name="author" content="MyHyvesbookplus corporation">
     <title>MyHyvesbook+</title>
     <link rel="stylesheet"
           type="text/css"
@@ -7,7 +10,11 @@
     <link rel="stylesheet"
           type="text/css"
           href="styles/index.css">
+    <link rel="stylesheet"
+          type="text/css"
+          href="styles/font-awesome.css">
     <script src="js/jquery.js"></script>
     <script src="js/registerAndLogin.js"></script>
     <script src='https://www.google.com/recaptcha/api.js'></script>
+
 </head>

website/views/menu.php

@@ -12,9 +12,11 @@
         </h4>
         <ul id="menu-groups-list" class="nav-list">
         </ul>
+    </section>
+    <section>
         <ul class="nav-list">
             <li>
-                <a href="#">
+                <a href="createGroup.php">
                     Maak een groep aan
                 </a>
             </li>

website/views/notification-center.php

@@ -14,7 +14,7 @@
             echo "<style>@import url('styles/adminbutton.css'); </style>";
         }
         ?>
-        <a href="logout.php" data-title="Admin"><i class="fa fa-sign-out"></i></a>
+        <a href="logout.php" data-title="Uitloggen"><i class="fa fa-sign-out"></i></a>
     </section>
     <section id="friend-request-section">
         <h4>

website/views/post-view.php

@@ -5,14 +5,6 @@ $fullname = $post['fname'] . " " . $post['lname'] . " (" . $post['username'] . "
 ?>
 <div class='post-header header'>
     <h4><?=$post['title']?></h4>
-    <?php if (checkPermissionOnPost($postID, $_SESSION["userID"])) {?>
-    <button class="deleteButton"
-            onclick="deletePost('<?=$postID?>')"
-            type="submit">
-        <i class="fa fa-trash"></i>
-        <span>Verwijder post</span>
-    </button><br />
-    <?php } ?>
     <span class='postinfo'>
         gepost door <?=$fullname?>,
             <span class='posttime' title='<?=$post['creationdate']?>'>
@@ -20,7 +12,14 @@ $fullname = $post['fname'] . " " . $post['lname'] . " (" . $post['username'] . "
             </span>
     </span>
 </div>
-
+<?php if (checkPermissionOnPost($postID, $_SESSION["userID"])) {?>
+    <button class="deleteButton fancy-button"
+            onclick="deletePost('<?=$postID?>')"
+            type="submit">
+        <span>Verwijder post</span>
+        <i class="fa fa-trash"></i>
+    </button><br />
+<?php } ?>
 <div class='post-content'>
     <p><?=$post['content']?></p>
 </div>
@@ -30,7 +29,7 @@ $fullname = $post['fname'] . " " . $post['lname'] . " (" . $post['username'] . "
         <form id="newcommentform" onsubmit="return false;">
             <input type="hidden" id="newcomment-textarea" name="postID" value="<?= $postID ?>">
             <textarea id="newcomment" name="newcomment-content" placeholder="Laat een reactie achter..." maxlength="1000"></textarea><span></span> <br>
-            <button onclick="postComment('reaction')" name="button" value="reaction">Reageer!</button>
+            <button onclick="postComment('reaction')" name="button" value="reaction" class="green"><i class="fa fa-comment"></i> Reageer!</button>
             <button onclick="postComment('nietslecht')" name="button" value="nietslecht" class="nietslecht">
             <?php
             if (checkNietSlecht($postID, $_SESSION["userID"])) {

website/views/profile.php

@@ -1,12 +1,22 @@
 <div class="content">
+    <div class='platform alertbox' id="alertbox">
+        <span class="alerttext" id="alerttext"></span>
+    </div>
+
     <div class="user-box">
-        <img class="profile-picture main-picture <?= $user["onlinestatus"] ?>" src="<?= $user["profilepicture"] ?>"><br />
+        <img alt="<?= $user["fname"] ?>" class="profile-picture main-picture <?= $user["onlinestatus"] ?>" src="<?= $user["profilepicture"] ?>"><br />
         <div class="platform">
             <div class="status-buttons-container">
-                <button disabled class="gray">
+                <div>
-                    <?= $user["onlinestatus"] ?>
+                    <button disabled class="gray">
-                </button>
+                        <?= $user["onlinestatus"] ?>
-                <button disabled class="gray"><?= $user["role"] ?></button>
+                    </button>
+                </div>
+                <div>
+                    <button disabled class="gray">
+                        <?= $user["role"] ?>
+                    </button>
+                </div>
             </div>
             <div class="friend-button-container">
                 <p>:)</p>
@@ -15,35 +25,47 @@
             <div class="profile-info">
                 <h2><?= $user["fname"]?> <?=$user["lname"]?></h2>
                 <h5><?=$user["username"]?></h5>
-                <?php if (strlen($user["bio"]) <= 50) {
+                <?php
+                if (strlen($user["bio"]) <= 50 and $showProfile) {
                     echo "<p>" . $user["bio"] . "</p>";
                 } ?>
             </div>
         </div>
     </div>
-    <?php if (strlen($user["bio"]) > 50) {
+    <?php if (strlen($user["bio"]) > 50 and $showProfile) {
         echo "<div class='platform'><h3>Bio:</h3><p>" . $user["bio"] . "</p></div>";
     } ?>
 
+    <?php if($showProfile) { ?>
     <div class="item-box platform">
         <h3>Informatie</h3>
-        <p>
+        <ul>
-            <ul>
+            <?php if ($user["showBday"]) { ?>
-                <li>Leeftijd: <?= getAge($user["birthdate"]) ?> jaar</li>
+            <li>Leeftijd: <?= getAge($user["birthdate"]) ?> jaar</li>
-                <li>Locatie: <?= $user["location"] ?></li>
+            <?php } ?>
-                <li>Lid sinds: <?= nicetime($user["creationdate"]) ?></li>
+            <?php if ($user["showEmail"]) { ?>
-            </ul>
+                <li>Email: <?= $user["email"] ?></li>
-        </p>
+            <?php } ?>
+            <li>Locatie: <?= $user["location"] ?></li>
+            <li>Lid sinds: <?= nicetime($user["creationdate"]) ?></li>
+        </ul>
     </div>
 
     <div class="item-box platform">
         <h3>Vrienden</h3>
         <p>
             <?php
-                while($friend = $profile_friends->fetch()) {
+                $friendcount = $profile_friends->rowCount();
-                    echo "<a href='profile.php?username=${friend["username"]}' data-title='${friend["username"]}'><img class='profile-picture' src='${friend["profilepicture"]}' alt='${friend["username"]}'s profielfoto></a>";
+                $frienddif = $friendcount - 7;
+
+                for ($i = 0; $i < min($friendcount, 7); $i += 1) {
+                    $friend = $profile_friends->fetch();
+                    echo "<a href='profile.php?username=${friend["username"]}' data-title='${friend["username"]}'><img class='profile-picture' height='42' width='42' src='${friend["profilepicture"]}' alt='${friend["username"]}' /></a>";
                 }
 
+                if ($frienddif > 0) {
+                    echo $frienddif === 1 ? "en nog 1 andere." : "...en nog $frienddif anderen.";
+                }
 
                 if($profile_friends->rowCount() === 0) {
                     echo "<p>Deze gebruiker heeft nog geen vrienden gemaakt.</p>";
@@ -56,10 +78,18 @@
         <h3>Groepen</h3>
         <p>
             <?php
-                while($group = $profile_groups->fetch()) {
+                $groupcount = $profile_groups->rowCount();
+                $groupdif = $groupcount - 7;
+
+                for ($i = 0; $i < min($groupcount, 7); $i += 1) {
+                    $group = $profile_groups->fetch();
                     echo "<a href='group.php?groupname=${group['name']}' data-title='${group["name"]}'><img class='group-picture' src='${group["picture"]}' alt='${group["name"]}s logo'></a>";
                 }
 
+                if ($groupdif > 0) {
+                    echo $groupdif === 1 ? "en nog 1 andere." : "...en nog $groupdif anderen.";
+                }
+
                 if($profile_groups->rowCount() === 0) {
                     echo "<p>Deze gebruiker is nog geen lid van een groep.</p>";
                 }
@@ -85,4 +115,5 @@
             </div>
         </div>
     </div>
+    <?php } ?>
 </div>

website/views/registerModal.php

@@ -4,7 +4,6 @@
 <!-- The Modal -->
 <div id="registerModal" class="modal">
     <form action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]);?>"
-          return= $correct
           method="post"
           name="forgotPassword">
 
@@ -15,14 +14,11 @@
                 <h3>Registreer uw account</h3>
             </div>
             <div class="modal-body">
-                <form action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]);?>"
-                      return= $correct
-                      method="post">
 
                     <div class="login_containerregister"><label>U krijgt een bevestigingsemail na het registreren</label></div>
 
                     <!-- Error message -->
-                    <div class="login_containerfault"><?php echo $genericErr;?></span></div>
+                    <div class="login_containerfault"><span><?php echo $genericErr;?></span></div>
 
                     <!-- Register name -->
                     <div class="login_containerregister">
@@ -82,7 +78,6 @@
                                placeholder="Voer uw wachtwoord in"
                                name="password"
                                value="<?php echo $password ?>"
-                               id="password"
                                required>
                         *<span class="error"> <?php echo $passwordErr;?></span>
                         <ul>
@@ -96,7 +91,6 @@
                                placeholder="Herhaal wachtwoord"
                                name="confirmpassword"
                                value="<?php echo $confirmpassword ?>"
-                               id="confirmpassword"
                                title="Herhaal wachtwoord"
                                required>
                         *<span class="error"> <?php echo $confirmpasswordErr;?></span>
@@ -120,7 +114,6 @@
                                placeholder="Voer uw email in"
                                name="email"
                                value="<?php echo $email ?>"
-                               id="email"
                                title="Voer een geldige email in"
                                required>
                         *<span class="error"> <?php echo $emailErr;?></span>
@@ -133,7 +126,6 @@
                                placeholder="Herhaal uw email"
                                name="confirmEmail"
                                value="<?php echo $confirmEmail ?>"
-                               id="email"
                                title="Herhaal uw email"
                                required>
                         *<span class="error"> <?php echo $confirmEmailErr;?></span>
@@ -152,8 +144,7 @@
                 <!-- Register button -->
                 <button type="submit"
                         value="register"
-                        name="submit"
+                        name="submit">
-                        id="frm1_submit">
                     Registreer
                 </button>
             </div>

website/views/search-view.php

@@ -48,7 +48,12 @@ $group_n = ($group_currentpage - 1) * $group_perpage;
             <label for="filter">
                 Filter:
             </label>
-            <select name="filter" id="search-filter">
+            <select name="filter"
+                    id="search-filter"
+                    onchange="$('#user-pagenumber, #group-pagenumber').prop('value', 1);
+                           searchUsers();
+                           searchGroups();
+                           pageNumber();">
                 <option value="personal"
                     <?php if ($filter == "personal") echo "selected";?>>
                     Persoonlijk</option>

website/views/settings-view.php

@@ -17,6 +17,7 @@ $settings = getSettings();
                     <input type="text"
                            name="fname"
                            id="fname"
+                           maxlength="63"
                            placeholder="Voornaam"
                            title="Voornaam"
                            value="<?=$settings["fname"]?>"
@@ -27,6 +28,7 @@ $settings = getSettings();
                     <input type="text"
                            name="lname"
                            id="lname"
+                           maxlength="63"
                            placeholder="Achternaam"
                            value="<?=$settings["lname"]?>"
                     >
@@ -36,14 +38,15 @@ $settings = getSettings();
                     <input type="text"
                            name="location"
                            id="location"
+                           maxlength="50"
                            placeholder="Locatie"
                            value="<?=$settings["location"]?>"
                     >
                 </li>
                 <li>
                     <?php $currentbday = new DateTime($settings["birthdate"]); ?>
-                    <label for="bday">Geboortedatum</label>
+                    <label>Geboortedatum</label>
-                    <select name='day' id="bday">
+                    <select name='day'>
                         <?php for ($day = 1; $day <= 31; $day++): ?>
                         <option value='<?=$day?>'
                                 <?=($day == $currentbday->format("d")) ? "selected" : ""?>
@@ -52,7 +55,7 @@ $settings = getSettings();
                         </option>
                         <?php endfor; ?>
                     </select>
-                    <select name='month' id="bday">
+                    <select name='month'>
                         <?php
                         $months = array ("januari", "februari", "maart", "april", "mei", "juni", "juli", "augustus",
                             "september", "oktober", "november", "december");
@@ -65,7 +68,7 @@ $settings = getSettings();
                             </option>
                         <?php endfor; ?>
                     </select>
-                    <select name='year' id="bday">
+                    <select name='year'>
                         <?php
                         $now = (new DateTime)->format("Y");
                         for ($year = $now; $year >= 1900; $year--): ?>
@@ -96,6 +99,14 @@ $settings = getSettings();
                            <?=($settings["showEmail"] ? "checked" : "")?>
                     >
                 </li>
+                <li>
+                    <label for="showProfile">Publiek profiel</label>
+                    <input type="checkbox"
+                           name="showProfile"
+                           id="showProfile"
+                        <?=($settings["showProfile"] ? "checked" : "")?>
+                    >
+                </li>
                 <li>
                     <label for="bio">Bio</label>
                     <textarea name="bio"
@@ -186,6 +197,7 @@ $settings = getSettings();
                     <label for="email-old">Huidig Email </label>
                     <input type="email"
                            id="email-old"
+                           maxlength="255"
                            value="<?=$settings["email"]?>"
                            disabled
                     >
@@ -194,6 +206,7 @@ $settings = getSettings();
                     <label for="email">Nieuw Email</label>
                     <input type="email"
                            name="email"
+                           maxlength="255"
                            id="email"
                            placeholder="Nieuw Email"
                     >
@@ -203,14 +216,16 @@ $settings = getSettings();
                     <input type="email"
                            name="email-confirm"
                            id="email-confirm"
+                           maxlength="255"
                            placeholder="Bevestig Email"
                     >
                 </li>
                 <li>
                     <button type="submit"
                             name="form"
-                            value="email"
+                            value="email">
-                    >Verander Email</button>
+                        Verander Email
+                    </button>
                 </li>
             </ul>
         </form>