comments

website/public/browserconfig.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-	<browserconfig>
-		<msapplication>
-			<tile>
-				<square70x70logo src="tiny.png"/>
-				<square150x150logo src="square.jpg"/>
-				<wide310x150logo src="wide.jpg"/>
-				<square310x310logo src="large.jpg"/>
-				<TileColor>#000000</TileColor>
-			</tile>
-		</msapplication>
-	</browserconfig>

website/public/group.php

@@ -13,7 +13,7 @@
 
 include_once("../queries/group_page.php");
 
-if(isset($_SESSION["userID"]) and !$group = selectGroupByName($_GET["groupname"])) {
+if(!$group = selectGroupByName($_GET["groupname"])) {
     header("HTTP/1.0 404 Not Found");
     header("Location: error/404.php");
     die();

website/public/js/chat.js

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

website/public/js/friendButtons.js

@@ -1,8 +1,6 @@
-// Show the right friendship buttonsto the user.
 function placeFriendButtons() {
     $.post("API/getFriendshipStatus.php", { usr: userID })
         .done(function(data) {
-            //save the friendship status
             var friendshipStatus = data;
             var $buttonContainer = $("div.friend-button-container");
             $("#start-profile-chat").hide();
@@ -24,7 +22,6 @@ function placeFriendButtons() {
                         text1 = "Word vrienden";
                         icon1 = "fa-user-plus";
                         break;
-                        // Users are friends.
                     case "1":
                         value1 = userID;
                         class1 = "green";
@@ -35,14 +32,12 @@ function placeFriendButtons() {
                         text2 = "Ontvriend";
                         icon2 = "fa-user-times";
                         break;
-                        // This user sent request.
                     case "2":
                         value1 = "delete";
                         class1 = "red";
                         text1 = "Trek verzoek in";
                         icon1 = "fa-times";
                         break;
-                        // Other user sent request.
                     case "3":
                         value1 = "accept";
                         class1 = "green";
@@ -55,7 +50,6 @@ function placeFriendButtons() {
                         break;
                 }
 
-                // Append buttons to the container.
                 $buttonContainer.append(
                     "<div><button class='"+ class1 +" fancy-button friend-button' value='"+ value1 +"'>" +
                     "<span>"+ text1 +"</span>" +
@@ -67,7 +61,7 @@ function placeFriendButtons() {
                     "<i class='fa fa-fw "+ icon2 +"'></i> " +
                     "</button></div>");
 
-            // Gets triggered when a friend button is triggered.
+
             $buttonContainer.find("button").click(function() {
                 if (isNaN(this.value))
                     editFriendship(userID, this.value);

website/public/js/groupButtons.js

@@ -3,28 +3,22 @@ function placeGroupButtons() {
         .done(function(data) {
             var $buttonContainer = $("div.group-button-container");
 
-            // Append the right group button to the button container.
-            // When user is not a member
-            if(data == 'none') {
+            if (data == 'none') {
                 $buttonContainer.append(
                     "<button class='green group-button fancy-button' value='request'>" +
                     "<span>Treed toe</span><i class='fa fa-plus'></i>" +
                     "</button>");
-
-                // when user sent a request to become a member.
-            } else if(data == 'request') {
+            } else if (data == 'request') {
                 $buttonContainer.append(
                     "<button class='red group-button fancy-button' value='none'>" +
                     "<span>Trek verzoek in</span><i class='fa fa-times'></i>" +
                     "</button>");
-                // When user is a member of the group.
             } 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 fancy-button' value='none'>" +
@@ -32,7 +26,6 @@ function placeGroupButtons() {
                     "</button>");
             }
 
-            // Gets triggered when a group button is clicked.
             $buttonContainer.children().click(function() {
                 if (this.value == 'admin') {
                     window.location.href='groupAdmin.php?groupID=' + groupID;

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

@@ -1,4 +1,3 @@
-// Vertical margin between two posts.
 margin = 20;
 
 // scrolling modal taken from http://stackoverflow.com/questions/10476632/how-to-scroll-the-page-when-a-modal-dialog-is-longer-than-the-screen
@@ -12,12 +11,9 @@ function scrollbarMargin(width, overflow) {
     });
 }
 
-// Get post from the server.
 function requestPost(postID) {
-    // Make the modal view visible.
     $(".modal").show();
 
-    // Send get request to the server to load the post.
     $.get("API/loadPost.php", { postID : postID }).done(function(data) {
         $('.modal-default').hide();
         var scrollBarWidth = window.innerWidth - document.body.offsetWidth;
@@ -27,14 +23,11 @@ function requestPost(postID) {
     });
 }
 
-// Create a new post.
 function postPost() {
     title = $("input.newpost[name='title']").val();
     content = $("textarea.newpost[name='content']").val();
-
-    // Masonrymode 2: when on group page and user is an admin.
+    console.log(masonryMode);
     if (masonryMode == 2) {
-        // Create the new group post.
         $.post("API/postPost.php", { title: title,
                                      content : content,
                                      group : groupID })
@@ -53,7 +46,6 @@ function postPost() {
                 }
             });
     } else {
-        // Create the new user post.
         $.post("API/postPost.php", { title: title,
                                      content : content })
             .done(function(data) {
@@ -84,7 +76,6 @@ var postAmount = 0;
 var noposts = false;
 
 $(document).ready(function () {
-    // Initialise variables for masonry.
     windowWidth = $(window).width();
     columnCount = Math.floor($(".posts").width() / 250);
     columns = new Array(columnCount);
@@ -95,7 +86,6 @@ $(window).on("load", function() {
     $(".modal-close").click(function (){closeModal()});
 
     // http://stackoverflow.com/questions/9439725/javascript-how-to-detect-if-browser-window-is-scrolled-to-bottom
-    // Infinite scroll.
     window.onscroll = function(ev) {
         if($(window).scrollTop() + $(window).height() == $(document).height() ) {
             loadMorePosts(userID, groupID, postAmount, postLimit);
@@ -118,7 +108,6 @@ $(window).on("load", function() {
 
 });
 
-// Hide modal view from the screen.
 function closeModal() {
     $(".modal").hide();
     scrollbarMargin(0, 'auto');
@@ -126,30 +115,23 @@ function closeModal() {
     $('.modal-default').show();
 }
 
-// Will fire when user resizes the window.
 $(window).resize(function() {
     clearTimeout(window.resizedFinished);
     window.resizeFinished = setTimeout(function() {
-        // Check if the width of the screen changed.
         if ($(window).width() != windowWidth) {
-            // Save width.
             windowWidth = $(window).width();
-            // Check if there fit more or less columns in the new width.
+
             if (columnCount != Math.floor($(".posts").width() / 250)) {
                 columnCount = Math.floor($(".posts").width() / 250);
-                // Respawn the masonry grid.
                 masonry(masonryMode);
             }
         }
     }, 250);
 });
 
-// Select the container for masonry.
 var $container = $(".posts");
 
-// Spawn the masonry grid.
 function masonry(mode) {
-    // save the masonry mode.
     masonryMode = mode;
     $container.children().remove();
 
@@ -157,7 +139,10 @@ function masonry(mode) {
     noposts = false;
     postAmount = 0;
 
-    // Initialise columns.
+    /*
+     * Initialise columns.
+     */
+
     for (i = 0; i < columnCount; i++) {
         $column = $("<div class=\"column\">");
         $column.width(100/columnCount + "%");
@@ -165,13 +150,11 @@ function masonry(mode) {
         columns[i] = [0, $column];
     }
 
-    // Place the form for new posts.
     if(mode > 0) {
         $postInput = $("<div class=\"post platform\">");
         $form = $("<form class=\"newpost\" action=\"API/postPost.php\" method=\"post\" onsubmit=\"postPost(); return false;\">");
         $postInput.append($form);
 
-        //Add extra input for group posts.
         if(mode == 2) {
             $form.append($("<input class=\"newpost\" type=\"hidden\" name=\"group\" value=\"" + groupID + "\">"));
         }
@@ -184,11 +167,17 @@ function masonry(mode) {
         columns[0][0] = $postInput.height() + margin;
     }
 
-    // Get the posts from the server.
+    /*
+     * Function will find the column with the shortest height.
+     */
+
+
+    /*
+     * Get the posts from the server.
+     */
     loadMorePosts(userID, groupID, 0, postLimit);
 }
 
-// Find the column with the shortest hight.
 function getShortestColumn(columns) {
     column = columns[0];
 
@@ -200,20 +189,17 @@ function getShortestColumn(columns) {
     return column;
 }
 
-// Load certain range of posts.
 function loadMorePosts(uID, gID, offset, limit) {
     if (noposts) {
         return;
     }
 
-    // Get a list of posts from the server.
     $.post("API/getPosts.php", { usr : uID,
                                  grp : gID,
                                  offset : offset,
                                  limit : limit})
         .done(function(data) {
             if (!data) {
-                // No posts were found, show noposts bar to user.
                 $('.noposts').show();
                 noposts = true;
                 return;
@@ -221,7 +207,9 @@ function loadMorePosts(uID, gID, offset, limit) {
 
             posts = JSON.parse(data);
 
-             // Rearange the objects.
+            /*
+             * Rearange the objects.
+             */
             $.each(posts, function() {
                 $post = $("<div class=\"post platform\" onclick=\"requestPost(\'"+this['postID']+"\')\">");
                 $post.append($("<h2>").html(this["title"]));

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/manifest.json

@@ -1,44 +0,0 @@
-{
-  "name": "Web Application Manifest Sample",
-  "icons": [
-    {
-      "src": "launcher-icon-0-75x.png",
-      "sizes": "36x36",
-      "type": "image/png",
-      "density": "0.75"
-    },
-    {
-      "src": "launcher-icon-1x.png",
-      "sizes": "48x48",
-      "type": "image/png",
-      "density": "1.0"
-    },
-    {
-      "src": "launcher-icon-1-5x.png",
-      "sizes": "72x72",
-      "type": "image/png",
-      "density": "1.5"
-    },
-    {
-      "src": "launcher-icon-2x.png",
-      "sizes": "96x96",
-      "type": "image/png",
-      "density": "2.0"
-    },
-    {
-      "src": "launcher-icon-3x.png",
-      "sizes": "144x144",
-      "type": "image/png",
-      "density": "3.0"
-    },
-    {
-      "src": "launcher-icon-4x.png",
-      "sizes": "192x192",
-      "type": "image/png",
-      "density": "4.0"
-    }
-  ],
-  "start_url": "index.html",
-  "display": "standalone",
-  "orientation": "portrait"
-}

website/public/profile.php

@@ -25,8 +25,7 @@ if(empty($_GET["username"])) {
     $userID = getUserID($_GET["username"]);
 }
 
-
-if (isset($_SESSION["userID"]) and !$user = selectUser($_SESSION["userID"], $userID)) {
+if(!$user = selectUser($_SESSION["userID"], $userID)) {
     header("HTTP/1.0 404 Not Found");
     header("Location: error/404.php");
     die();

website/public/styles/adminpanel.css

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

website/queries/groupAdmin.php

@@ -52,7 +52,7 @@ function updateGroupSettings(int $groupID)
 }
 
 /**
- * Checks if a user is an admin for a page.
+ * Checks if an user is an admin for a page.
  * @param int $groupID
  * @param int $userID
  * @return bool

website/queries/login.php

@@ -38,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/nicetime.php

@@ -1,16 +1,9 @@
 <?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");
@@ -22,8 +15,7 @@ function nicetime($date) {
         return "Bad date";
     }
 
-    // Check if it is in the future or not.
-    if($now >= $unix_date) {
+    if($now > $unix_date) {
         $difference = $now - $unix_date;
         $tense = "geleden";
     } else {
@@ -31,7 +23,6 @@ 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/post.php

@@ -2,12 +2,6 @@
 
 require_once("connect.php");
 
-/**
- * Select all posts on a user.
- * @param $userID
- * @param $groupID
- * @return bool|PDOStatement
- */
 function selectAllPosts($userID, $groupID) {
     $stmt = prepareQuery("
         SELECT
@@ -52,14 +46,6 @@ 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
@@ -108,13 +94,9 @@ 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
@@ -140,11 +122,6 @@ function selectPostById($postID) {
     return $stmt;
 }
 
-/**
- * Get all the comments from a post.
- * @param $postID
- * @return PDOStatement
- */
 function selectCommentsByPostId($postID) {
     $stmt = prepareQuery("
         SELECT
@@ -171,13 +148,6 @@ 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
@@ -202,13 +172,6 @@ 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
@@ -231,12 +194,6 @@ 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);
@@ -245,12 +202,6 @@ 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
@@ -267,12 +218,6 @@ 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
@@ -285,12 +230,6 @@ 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
@@ -305,11 +244,6 @@ 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("
@@ -323,12 +257,6 @@ 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
@@ -354,10 +282,10 @@ function checkPermissionOnPost(int $postID, int $userID) : bool {
 }
 
 /**
- * Returns role of a user.
+ * Returns role of an user.
  * @param int $userID
  * @param int $groupID
- * @return mixed role of a user.
+ * @return mixed role of an user.
  */
 function getRoleInGroup(int $userID, int $groupID) {
     $stmt = prepareQuery("

website/queries/private_message.php

@@ -1,10 +1,5 @@
 <?php
 
-/**
- * Get the the last 100 chat messages.
- * @param $user2ID
- * @return string
- */
 function getOldChatMessages($user2ID) {
     require_once ("friendship.php");
     $user1ID = $_SESSION["userID"];
@@ -41,12 +36,6 @@ 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) {
@@ -76,12 +65,6 @@ 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) {
@@ -113,10 +96,7 @@ function getNewChatMessages($lastID, $destination) {
     }
 }
 
-/**
- * Get of every friend the first unread chat message.
- * @return string
- */
+
 function selectAllUnreadChat() {
     $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/user.php

@@ -2,10 +2,6 @@
 
 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
@@ -19,11 +15,6 @@ function updateLastActivity() {
     return $stmt->execute();
 }
 
-/**
- * This gets the userID from a username
- * @param $username
- * @return mixed
- */
 function getUserID($username) {
     $stmt = prepareQuery("
         SELECT
@@ -39,11 +30,6 @@ function getUserID($username) {
     return $stmt->fetch()["userID"];
 }
 
-/**
- * This gets the username from a userID
- * @param $userID
- * @return mixed
- */
 function getUsername($userID) {
     $stmt = prepareQuery("
         SELECT
@@ -59,12 +45,6 @@ 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
@@ -127,11 +107,6 @@ function selectUser($me, $other) {
     return $stmt->fetch();
 }
 
-/**
- * Select all the users from a group.
- * @param $userID
- * @return PDOStatement
- */
 function selectAllUserGroups($userID) {
     $stmt = prepareQuery("
         SELECT
@@ -155,11 +130,6 @@ 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
@@ -185,12 +155,6 @@ 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
@@ -219,13 +183,6 @@ 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
@@ -258,14 +215,6 @@ 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.
@@ -303,12 +252,6 @@ 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
@@ -333,12 +276,7 @@ function countSomeUsersByStatus($search, $status) {
     return $q;
 }
 
-/**
- * Change the user status
- * @param $id
- * @param $status
- * @return PDOStatement
- */
+
 function changeUserStatusByID($id, $status) {
     $q = prepareQuery("
     UPDATE
@@ -355,12 +293,6 @@ 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
@@ -378,13 +310,6 @@ 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
@@ -404,11 +329,6 @@ 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
@@ -437,13 +357,6 @@ function selectRandomNotFriendUser($userID) {
     return $stmt->fetch();
 }
 
-/**
- * Search users.
- * @param $n
- * @param $m
- * @param $search
- * @return string
- */
 function searchSomeUsers($n, $m, $search) {
     $stmt = prepareQuery("
     SELECT
@@ -484,11 +397,6 @@ 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
@@ -512,11 +420,6 @@ function countSomeUsers($search) {
         return $q;
 }
 
-/**
- * Get the role of a user by userID.
- * @param $userID
- * @return mixed
- */
 function getRoleByID($userID) {
     $stmt = prepareQuery("
         SELECT
@@ -532,11 +435,6 @@ 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-table.php

@@ -1,5 +1,5 @@
 <tr>
-    <th class="table-checkbox"><input class="table-checkbox" type="checkbox" id="checkall" name="checkall" onchange="checkAll()"></th>
+    <th><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>

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

@@ -2,40 +2,6 @@
 <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">
-<!--Favicon-->
-<!-- Desktop Browsers -->
-<link rel="shortcut icon" type="image/x-icon" href="favicon.ico" />
-
-<!-- Android: Chrome M39 and up-->
-<link rel="manifest" href="manifest.json">
-<!-- Android: Chrome M31 and up, ignored if manifest is present-->
-<meta name="mobile-web-app-capable" content="yes">
-<link rel="icon" sizes="192x192" href="icon-192x192.png">
-<!-- iOS -->
-<meta name="apple-mobile-web-app-capable" content="yes">
-<meta name="apple-mobile-web-app-title" content="My Awesome Web App">
-
-<link rel="apple-touch-icon" sizes="180x180" href="apple-touch-icon-180x180-precomposed.png">
-<link href="apple-touch-icon-152x152-precomposed.png" sizes="152x152" rel="apple-touch-icon">
-<link href="apple-touch-icon-144x144-precomposed.png" sizes="144x144" rel="apple-touch-icon">
-<link href="apple-touch-icon-120x120-precomposed.png" sizes="120x120" rel="apple-touch-icon">
-<link href="apple-touch-icon-114x114-precomposed.png" sizes="114x114" rel="apple-touch-icon">
-<link href="apple-touch-icon-76x76-precomposed.png" sizes="76x76" rel="apple-touch-icon">
-<link href="apple-touch-icon-72x72-precomposed.png" sizes="72x72" rel="apple-touch-icon">
-<link href="apple-touch-icon-60x60-precomposed.png" sizes="60x60" rel="apple-touch-icon">
-<link href="apple-touch-icon-57x57-precomposed.png" sizes="57x57" rel="apple-touch-icon">
-<link href="apple-touch-icon-precomposed.png" rel="apple-touch-icon">
-
-<!-- Windows 8 and IE 11 -->
-<meta name="msapplication-config" content="browserconfig.xml" />
-
-<!-- Windows -->
-<meta name="application-name" content="My Awesome Web App" />
-<meta name="msapplication-tooltip" content="Get the latest updates!" />
-<meta name="msapplication-window" content="width=1024;height=768" />
-<meta name="msapplication-navbutton-color" content="#FF3300" />
-<meta name="msapplication-starturl" content="./" />
-
 <title>MyHyvesbook+</title>
 <!-- Add your javascript files here. -->
 <script src="js/jquery.js"></script>

website/views/homeLoginRegister.php

@@ -1,7 +1,7 @@
 <?php
 session_start();
 
-// Checks if there's a user already logged in
+// Checks if there's an user already logged in
 if(isset($_SESSION["userID"])){
     echo "<script>
                 window.onload=checkLoggedIn();

website/views/login_head.php

@@ -3,40 +3,6 @@
     <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">
-    <!-- Favicon-->
-    <!-- Desktop Browsers -->
-    <link rel="shortcut icon" type="image/x-icon" href="favicon.ico" />
-
-    <!-- Android: Chrome M39 and up-->
-    <link rel="manifest" href="manifest.json">
-    <!-- Android: Chrome M31 and up, ignored if manifest is present-->
-    <meta name="mobile-web-app-capable" content="yes">
-    <link rel="icon" sizes="192x192" href="icon-192x192.png">
-    <!-- iOS -->
-    <meta name="apple-mobile-web-app-capable" content="yes">
-    <meta name="apple-mobile-web-app-title" content="My Awesome Web App">
-
-    <link rel="apple-touch-icon" sizes="180x180" href="apple-touch-icon-180x180-precomposed.png">
-    <link href="apple-touch-icon-152x152-precomposed.png" sizes="152x152" rel="apple-touch-icon">
-    <link href="apple-touch-icon-144x144-precomposed.png" sizes="144x144" rel="apple-touch-icon">
-    <link href="apple-touch-icon-120x120-precomposed.png" sizes="120x120" rel="apple-touch-icon">
-    <link href="apple-touch-icon-114x114-precomposed.png" sizes="114x114" rel="apple-touch-icon">
-    <link href="apple-touch-icon-76x76-precomposed.png" sizes="76x76" rel="apple-touch-icon">
-    <link href="apple-touch-icon-72x72-precomposed.png" sizes="72x72" rel="apple-touch-icon">
-    <link href="apple-touch-icon-60x60-precomposed.png" sizes="60x60" rel="apple-touch-icon">
-    <link href="apple-touch-icon-57x57-precomposed.png" sizes="57x57" rel="apple-touch-icon">
-    <link href="apple-touch-icon-precomposed.png" rel="apple-touch-icon">
-
-    <!-- Windows 8 and IE 11 -->
-    <meta name="msapplication-config" content="browserconfig.xml" />
-
-    <!-- Windows -->
-    <meta name="application-name" content="My Awesome Web App" />
-    <meta name="msapplication-tooltip" content="Get the latest updates!" />
-    <meta name="msapplication-window" content="width=1024;height=768" />
-    <meta name="msapplication-navbutton-color" content="#FF3300" />
-    <meta name="msapplication-starturl" content="./" />
-
     <title>MyHyvesbook+</title>
     <link rel="stylesheet"
           type="text/css"