comments

Comments

See merge request !203

website/public/groupAdmin.php

@@ -21,6 +21,8 @@ require_once "../queries/alerts.php";
 include("../views/main.php");
 $alertClass;
 $alertMessage;
+
+// Select which button has been pressed.
 if ($_SERVER["REQUEST_METHOD"] == "POST") {
     try {
         switch ($_POST["form"]) {
@@ -44,6 +46,15 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
                 }
                 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();

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/loginRegisterModals.js

@@ -7,7 +7,7 @@ var facebookModal = document.getElementById("fbModal");
 // Get the button that opens the modal
 var registerBtn = document.getElementById("registerBtn");
 var btn = document.getElementById("myBtn");
-var fbBtn = document.getElementById("fbBtn");
+
 
 // Get the <span> element that closes the modal
 var span = document.getElementsByClassName("close")[0];
@@ -24,9 +24,6 @@ btn.onclick = function () {
 registerBtn.onclick = function () {
     registerModal.style.display = "block";
 }
-fbBtn.onclick = function () {
-    facebookModal.style.display = "block";
-}
 
 /**
  * WHen the user clicks on (X), close the modal

website/public/js/masonry.js

@@ -91,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() {

website/public/js/post.js

@@ -1,4 +1,9 @@
 
+/**
+ * Posts a comment or "Niet slecht." on a post.
+ * Button specifies between comment and "Niet slecht.".
+ * Alerts or redirects if frozen or not logged in.
+ */
 function postComment(buttonValue) {
     formData = $("#newcommentform").serializeArray();
     formData.push({name: "button", value: buttonValue});
@@ -24,6 +29,10 @@ function postComment(buttonValue) {
     });
 }
 
+/**
+ * Deletes a post given by postID, closes modal and reloads posts.
+ * @param postID
+ */
 function deletePost(postID) {
     var formData = [{name: "postID", value: postID}];
     $.post(

website/public/js/registerAndLogin.js

@@ -1,3 +1,4 @@
+// Checks if user is logged in and offers to logout.
 function checkLoggedIn() {
     if (confirm("U bent al ingelogd!\nWilt u uitloggen?\nKlik ok om uit te loggen.") == true) {
         window.location.href = "logout.php";
@@ -6,18 +7,22 @@ function checkLoggedIn() {
     }
 }
 
+// Alert for validation mail.
 function emailAlert(){
     alert("Bevestigingsemail is gestuurd!\n");
 }
 
+// Alert for banned account.
 function bannedAlert(){
     alert("Uw account is geband!");
 }
 
+// Alert for frozen account.
 function frozenAlert(){
     alert("Uw account is bevroren!\n");
 }
 
+// Alert for unconfirmed email.
 function emailNotConfirmed(){
     alert("Uw account is nog niet bevestigd!\nEr is een nieuwe email gestuurd om uw account te bevestigen");
 }

website/public/settings.php

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

website/public/styles/adminpanel.css

@@ -34,9 +34,10 @@
     width: 100%;
 }
 
-.usertable .table-username {width: 150px}
-.usertable .table-status {width: 100px}
-.usertable .table-action {width: 200px}
+.table-checkbox {width: 20px}
+.table-username {width: 150px}
+.table-status {width: 100px}
+.table-action {width: 200px}
 
 .usertable th, td {
     border-bottom: 1px solid #ddd;
@@ -51,6 +52,10 @@
     background-color: #f5f5f5;
 }
 
+.bancomment {
+    width: 80%;
+}
+
 .bancommentedit {
     display: none;
 }

website/queries/checkInput.php

@@ -41,7 +41,11 @@ 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!");
@@ -52,7 +56,11 @@ function checkName($variable){
     }
 }
 
-/* Checks for bday */
+/**
+ * Checks for bday
+ * @param $variable
+ * @throws bdayException
+ */
 function validateBday($variable){
     if (empty($variable)) {
         throw new bdayException("Verplicht!");
@@ -216,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)
@@ -227,7 +239,9 @@ class lettersAndSpacesException extends Exception
     }
 }
 
-
+/**
+ * Class bdayException
+ */
 class bdayException extends Exception
 {
     public function __construct($message = "", $code = 0, Exception $previous = null)
@@ -236,6 +250,9 @@ class bdayException extends Exception
     }
 }
 
+/**
+ * Class usernameException
+ */
 class usernameException extends Exception
 {
     public function __construct($message = "", $code = 0, Exception $previous = null)
@@ -244,6 +261,9 @@ class usernameException extends Exception
     }
 }
 
+/**
+ * Class passwordException
+ */
 class passwordException extends Exception
 {
     public function __construct($message = "", $code = 0, Exception $previous = null)
@@ -252,6 +272,9 @@ class passwordException extends Exception
     }
 }
 
+/**
+ * Class confirmPasswordException
+ */
 class confirmPasswordException extends Exception
 {
     public function __construct($message = "", $code = 0, Exception $previous = null)
@@ -260,6 +283,9 @@ class confirmPasswordException extends Exception
     }
 }
 
+/**
+ * Class fbConfirmPasswordException
+ */
 class fbConfirmPasswordException extends Exception
 {
     public function __construct($message = "", $code = 0, Exception $previous = null)
@@ -268,6 +294,9 @@ class fbConfirmPasswordException extends Exception
     }
 }
 
+/**
+ * Class emailException
+ */
 class emailException extends Exception
 {
     public function __construct($message = "", $code = 0, Exception $previous = null)
@@ -276,6 +305,9 @@ class emailException extends Exception
     }
 }
 
+/**
+ * Class confirmEmailException
+ */
 class confirmEmailException extends Exception
 {
     public function __construct($message = "", $code = 0, Exception $previous = null)
@@ -284,6 +316,9 @@ class confirmEmailException extends Exception
     }
 }
 
+/**
+ * Class captchaException
+ */
 class captchaException extends Exception
 {
     public function __construct($message = "", $code = 0, Exception $previous = null)
@@ -292,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

@@ -2,8 +2,13 @@
 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`)
@@ -13,6 +18,7 @@ function createGroup()
     $createGroup->bindValue(':description', test_input($_POST["bio"]));
     $createGroup->execute();
 
+    // Gets the groupID just created.
     $getGroupID = prepareQuery("
     SELECT
         `groupID`
@@ -24,6 +30,7 @@ function createGroup()
     $getGroupID->execute();
     $groupID = $getGroupID->fetch()["groupID"];
 
+    // Adds the user as an admin.
     $makeUserAdmin = prepareQuery("
     INSERT INTO
         `group_member` (userID, groupID, role)

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,10 +2,21 @@
 
 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
@@ -46,7 +57,11 @@ 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
@@ -83,6 +98,10 @@ function selectAllFriends($userID) {
     return $stmt;
 }
 
+/**
+ * Returns all friend requests of the current user.
+ * @return string
+ */
 function selectAllFriendRequests() {
     $stmt = prepareQuery("
         SELECT
@@ -119,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
@@ -162,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)
@@ -173,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`
@@ -189,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`
@@ -204,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
@@ -234,6 +278,13 @@ 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
@@ -281,6 +332,11 @@ function searchSomeFriends($n, $m, $search) {
     return json_encode($stmt->fetchAll());
 }
 
+/**
+ * Counts all friends of current user filtered by search.
+ * @param $search
+ * @return string
+ */
 function countSomeFriends($search) {
     $stmt = prepareQuery("
     SELECT

website/queries/groupAdmin.php

@@ -1,4 +1,9 @@
 <?php
+/**
+ * Gets the current settings for a group.
+ * @param int $groupID
+ * @return mixed
+ */
 function getGroupSettings(int $groupID) {
     $stmt = prepareQuery("
     SELECT
@@ -15,6 +20,12 @@ function getGroupSettings(int $groupID) {
     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"])) {
@@ -40,6 +51,12 @@ function updateGroupSettings(int $groupID)
     }
 }
 
+/**
+ * Checks if an 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
@@ -60,7 +77,40 @@ function checkGroupAdmin(int $groupID, int $userID) : bool {
     return ($role == "admin");
 }
 
-function getAllGroupMembers(int $groupID) {
+/**
+ * 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`,
@@ -74,16 +124,25 @@ function getAllGroupMembers(int $groupID) {
         ON
           `group_member`.`userID` = `user`.`userID`
         WHERE
-          `groupID` = :groupID AND `group_member`.`role` = 'member'
+          `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");
@@ -107,3 +166,27 @@ function upgradeUser(int $groupID, int $userID, string $role) {
         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,11 @@ 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
@@ -78,6 +101,13 @@ function countSomeOwnGroups($search) {
     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
@@ -92,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
@@ -109,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
@@ -41,6 +45,11 @@ function selectGroupByName($name) {
     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
@@ -63,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
@@ -80,6 +94,11 @@ 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
@@ -105,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
@@ -127,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
@@ -149,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
@@ -174,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
@@ -201,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.
@@ -233,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
@@ -256,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
@@ -272,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
@@ -289,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
@@ -312,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,6 +1,9 @@
 <?php
 
-//Find matching password with the inputted username/emailadress.
+/**
+ * Find matching password with the inputted username/emailadress.
+ * @return mixed
+ */
 function getUser() {
     $stmt = prepareQuery("
     SELECT
@@ -35,7 +38,8 @@ function getUserID() {
 }
 
 function validateLogin($username, $password, $url){
-        // Empty username or password field
+    echo $url;
+    // Empty username or password field
     if (empty($username) || empty($password)) {
         throw new loginException("Inloggegevens zijn niet ingevuld");
     }

website/queries/post.php

@@ -281,6 +281,12 @@ function checkPermissionOnPost(int $postID, int $userID) : bool {
     }
 }
 
+/**
+ * Returns role of an user.
+ * @param int $userID
+ * @param int $groupID
+ * @return mixed role of an user.
+ */
 function getRoleInGroup(int $userID, int $groupID) {
     $stmt = prepareQuery("
     SELECT

website/queries/register.php

@@ -1,9 +1,5 @@
 <?php
 
-/**
- * Returns 1 if an username exists with the filled in username.
- * @return int
- */
 function getExistingUsername() {
     $stmt = prepareQuery("
     SELECT
@@ -20,10 +16,6 @@ function getExistingUsername() {
 
 }
 
-/**
- * Returns 1 if an username exists with facebooklogin
- * @return int
- */
 function getExistingFBUsername() {
     $stmt = prepareQuery("
     SELECT
@@ -40,10 +32,6 @@ function getExistingFBUsername() {
 
 }
 
-/**
- * Returns 1 if an email exists with the filled in email.
- * @return int
- */
 function getExistingEmail() {
     $stmt = prepareQuery("
     SELECT
@@ -60,10 +48,6 @@ function getExistingEmail() {
 
 }
 
-/**
- * Returns 1 if an email exists with facebook register
- * @return int
- */
 function getExistingFBEmail() {
     $stmt = prepareQuery("
     SELECT
@@ -81,10 +65,6 @@ function getExistingFBEmail() {
 
 }
 
-/**
- * Returns 1 if an email exists with the forgot email input
- * @return int
- */
 function getResetEmail() {
     $stmt = prepareQuery("
     SELECT
@@ -101,9 +81,6 @@ function getResetEmail() {
 
 }
 
-/**
- * Registers a new account in the database
- */
 function registerAccount() {
     $stmt = prepareQuery("
     INSERT INTO
@@ -142,9 +119,6 @@ function registerAccount() {
     $stmt->rowCount();
 }
 
-/**
- * Registers a new account with facebook register
- */
 function fbRegisterAccount() {
     $stmt = prepareQuery("
     INSERT INTO
@@ -184,11 +158,6 @@ function fbRegisterAccount() {
     return $stmt->execute();
 }
 
-/**
- * Checks which dates need to be selected when there is an invalid registration.
- * @param $date
- * @param $value
- */
 function submitselect($date, $value){
     if ($date == $value){
         echo "selected";

website/queries/requestpassword.php

@@ -1,10 +1,6 @@
 <?php
 include_once "../queries/connect.php";
 
-/**
- * Sends a link to an email to change the password of an account
- * @param string $email
- */
 function sendPasswordRecovery(string $email) {
     if (filter_var($email, FILTER_VALIDATE_EMAIL)) {
         $stmt = prepareQuery("
@@ -28,16 +24,11 @@ function sendPasswordRecovery(string $email) {
         $hashedHash = password_hash($hash, PASSWORD_DEFAULT);
         setHashToDatabase($userID, $hash);
         doSendPasswordRecovery($userID, $email, $username, $hashedHash);
+    } else {
+        // TODO: Be angry!
     }
 }
 
-/**
- * Sets the message in the email to reset a password of an account.
- * @param int $userID
- * @param string $email
- * @param string $username
- * @param string $hash
- */
 function doSendPasswordRecovery(int $userID, string $email, string $username, string $hash) {
     $resetLink = "https://myhyvesbookplus.nl/resetpassword.php?u=$userID&h=$hash";
 
@@ -47,11 +38,6 @@ function doSendPasswordRecovery(int $userID, string $email, string $username, st
     mail($email, $subject, $body, $header);
 }
 
-/**
- * Sets the previous password invalid.
- * @param int $userID
- * @param string $hash
- */
 function setHashToDatabase(int $userID, string $hash) {
     $stmt = prepareQuery("
     UPDATE

website/queries/settings.php

@@ -16,7 +16,10 @@ function getSettings() {
       `location`,
       `birthdate`,
       `bio`,
-      `profilepicture`,
+      IFNULL(
+                `profilepicture`,
+                '../img/avatar-standard.png'
+            ) AS profilepicture,
       `showBday`,
       `showEmail`,
       `showProfile`

website/views/adminpanel-grouptable.php

@@ -3,7 +3,7 @@
     <th class="table-username">Groepsnaam</th>
     <th class="table-status">Status</th>
     <th class="table-comment">Beschrijving</th>
-    <th class="table-action">Actie</th>
+    <th class="table-action">Zichtbaarheid</th>
 </tr>
 
 <?php

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.php

@@ -1,5 +1,4 @@
-
-<!-- function test_input taken from http://www.w3schools.com/php/php_form_validation.asp -->
+<!-- Form value holding. -->
 <?php
 $search = "";
 $status = array("user", "frozen", "banned", "unconfirmed", "admin", "owner");
@@ -127,11 +126,11 @@ if (isset($_GET["groupstatus"])) {
                     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 Eigenaar</button>";
                     }
                     ?>
@@ -140,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">Verborgen</button>
-                    <button type="submit" name="batchactions" id="ban" value="public">Publiek</button>
-                    <button type="submit" name="batchactions" id="members" value="membersonly">Alleen Leden</button>
+                    <button type="submit" name="batchactions" id="batch-hide" value="hidden">Verborgen</button>
+                    <button type="submit" name="batchactions" id="batch-public" value="public">Publiek</button>
+                    <button type="submit" name="batchactions" id="batch-members" value="membersonly">Alleen Leden</button>
                 </form>
             </div>
 
@@ -152,5 +151,3 @@ if (isset($_GET["groupstatus"])) {
         </div>
     </div>
 </div>
-</body>
-</html>

website/views/facebookRegisterModal.php

@@ -1,9 +1,3 @@
-<?php
-if(isset($acces_token)) {
-    echo '<button id="fbBtn" class="button">Facebook registreer</button>';
-
-}
-?>
 <!-- The Modal -->
 <div id="fbModal" class="modal">
     <form action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]);?>"

website/views/group.php

@@ -16,9 +16,18 @@
         <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>

website/views/groupAdmin.php

@@ -16,7 +16,7 @@ $groupinfo = getGroupSettings($_GET["groupID"]);
                 <li>
                     <label></label>
                     <a href="group.php?groupname=<?=$groupinfo["name"]?>">
-                        <button class="fa fa-chevron-left"> Terug naar de groep</button>
+                        <button><i class="fa fa-chevron-left"></i> Terug naar de groep</button>
                     </a>
                 </li>
             </ul>
@@ -51,8 +51,7 @@ $groupinfo = getGroupSettings($_GET["groupID"]);
                     <button type="submit"
                             name="form"
                             value="group"
-                            class="fa fa-save"
-                    > Opslaan</button>
+                    ><i class="fa fa-save"></i> Opslaan</button>
                 </li>
             </ul>
         </form>
@@ -80,8 +79,7 @@ $groupinfo = getGroupSettings($_GET["groupID"]);
                     <button type="submit"
                             name="form"
                             value="picture"
-                            class="fa fa-picture-o"
-                    > Verander profielfoto</button>
+                    ><i class="fa fa-picture-o"></i> Verander profielfoto</button>
                 </li>
             </ul>
         </form>
@@ -94,7 +92,7 @@ $groupinfo = getGroupSettings($_GET["groupID"]);
                     <select name="userID">
                         <option disabled selected>Geen gebruiker geselecteerd:</option>
                         <?php
-                        $groupMembers = getAllGroupMembers($_GET["groupID"]);
+                        $groupMembers = getAllGroupUsers($_GET["groupID"]);
                         foreach ($groupMembers as $groupMember) {?>
                             <option value="<?=$groupMember["userID"]?>">
                                 <?=$groupMember["fullname"]?> (<?=$groupMember["username"]?>)
@@ -114,11 +112,55 @@ $groupinfo = getGroupSettings($_GET["groupID"]);
                 </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 class="fa fa-chevron-left"> Terug naar de groep</button></a>
+                    <a href="group.php?groupname=<?=$groupinfo["name"]?>"><button><i class="fa fa-chevron-left"></i> Terug naar de groep</button></a>
                 </li>
             </ul>
         </div>

website/views/profile.php

@@ -55,10 +55,17 @@
         <h3>Vrienden</h3>
         <p>
             <?php
-                while($friend = $profile_friends->fetch()) {
+                $friendcount = $profile_friends->rowCount();
+                $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>";
@@ -71,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>";
                 }