Added comments

Also hiding the mail/age if said so by the user

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

@@ -6,12 +6,15 @@ require_once("../../queries/private_message.php");
 require_once("../../queries/checkInput.php");
 require_once("../../queries/user.php");
 
+// Check if the user is allowed to send a message.
 if (isset($_SESSION["userID"]) &&
     getRoleByID($_SESSION["userID"]) != 'frozen' &&
     getRoleByID($_SESSION["userID"]) != 'banned') {
     if (!empty(test_input($_POST["destination"])) &&
         !empty(test_input($_POST["content"]))
     ) {
+        // Send the message.
+        // Returns false when it didn't succeed sending the message.
         if (sendMessage(test_input($_POST["destination"]), test_input($_POST["content"]))) {
             echo 1;
         } else {

website/public/bits/friend-item.php

@@ -4,6 +4,7 @@ session_start();
 
 include_once ("../../queries/friendship.php");
 
+// Initialize variables to given or default values.
 if (isset($_POST["action"])) {
     $action = $_POST["action"];
 } else {
@@ -18,6 +19,8 @@ if (isset($_POST["actionType"])) {
 
 $friends = json_decode($_POST["friends"]);
 
+
+// Foreach friend, return them as list item.
 foreach($friends as $i => $friend) {
     $friendshipStatus = getFriendshipStatus($friend->userID);
     ?>
@@ -48,6 +51,7 @@ foreach($friends as $i => $friend) {
             </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/js/chat.js

@@ -9,13 +9,17 @@ $(document).ready(function() {
     $(".chat-field").hide();
 });
 
+// This function loads the new messages and runs the addMessages function to show them.
 function loadMessages() {
+    // If the function is not running elsewhere, run it here.
     if (!gettingMessages) {
         gettingMessages = true;
+        // Get the messages.
         $.post(
             "API/loadMessages.php",
             $("#lastIDForm").serialize()
         ).done(function (data) {
+            // Post the messages in the chat.
             if (data && data != "[]") {
                 messages = JSON.parse(data);
                 addMessages(messages);
@@ -28,7 +32,7 @@ function loadMessages() {
     }
 }
 
-
+// Send a message to a friend of the user.
 function sendMessage() {
     $.post(
         "API/sendMessage.php",
@@ -37,42 +41,54 @@ function sendMessage() {
         if (response == "frozen") {
             alert("Je account is bevroren, dus je kan niet chat berichten versturen. Contacteer een admin als je denkt dat dit onjuist is.");
         }
+        // Load messages if the message has been send, so it shows in the chat.
+        loadMessages();
     });
 
     $("#newContent").val("");
-    loadMessages();
 }
 
+// Add messages to the chat.
 function addMessages(messages) {
     var messagesText = "";
+
+    // Loop over all the messages.
     for(var i in messages) {
-        // Initialize message variables
+        // Initialize message variables.
         var thisDate = new Date(messages[i].creationdate.replace(/ /,"T"));
         var thisTime = thisDate.getHours() + ":" + thisDate.getMinutes();
         var type;
         thisDate.setHours(0,0,0,0);
 
+        // See where the message has been send from, so it shows on the right side.
         if (messages[i].destination == $(".destinationID").val()) {
             type = "chat-message-self";
         } else {
             type = "chat-message-other";
         }
+
+        // If it is the first message, open the message box and maybe add a year.
         if (i == 0) {
+            if (thisDate.getTime() > previousDate.getTime()) {
+                messagesText += '\
+                    <div class="day-message"> \
+                        <div class="day-message-content">\
+                        ' + days[thisDate.getDay()] + " " + thisDate.getDate() + " " + months[thisDate.getMonth()] + " " + thisDate.getFullYear() + '\
+                        </div> \
+                    </div>';
+            }
             previousDate = thisDate;
-            messagesText += '\
-                <div class="day-message"> \
-                    <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 +99,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 +112,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 +130,7 @@ function switchUser(userID) {
     $("#friend-item-" + userID).addClass("active-friend-chat");
 }
 
+// Insert a message in the chat, this is used when it is empty.
 function sayEmpty() {
     $("#chat-history").html("Probeer ook eens foto's en video's te sturen");
 }

website/public/js/main.js

@@ -38,6 +38,8 @@ function fancyText(text) {
     return text;
 }
 
+// This function gets the value of a cookie when given a key.
+// If didn´t find any compatible cookie, it returns false.
 function getCookie(key) {
     cookies = document.cookie.split("; ");
     for (var i in cookies) {
@@ -49,6 +51,7 @@ function getCookie(key) {
     return false;
 }
 
+// Edit the friendship status of two users.
 function editFriendship(userID, value) {
     $.post("API/editFriendship.php", { usr: userID, action: value })
     .done(function() {
@@ -57,6 +60,8 @@ function editFriendship(userID, value) {
     });
 }
 
+// Show the given friends in the given list.
+// The friends are giving in JSON, and the list is giving with a hashtag.
 function showFriends(friends, list) {
     if(friends && friends != "[]") {
         $(list).load("bits/friend-item.php", {
@@ -69,6 +74,8 @@ function showFriends(friends, list) {
     }
 }
 
+// Show the given friends in the given list.
+// This function supports more options given as parameters. This adds extra functionality.
 function showFriendsPlus(friends, list, limit, action, actionType) {
     if(friends && friends != "[]") {
         $(list).load("bits/friend-item.php", {
@@ -84,6 +91,7 @@ function showFriendsPlus(friends, list, limit, action, actionType) {
     }
 }
 
+// Show the given groups in the given list.
 function showGroups(groups, list) {
     if(groups && groups != "[]") {
         $(list).load("bits/group-item.php", {

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/queries/friendship.php

@@ -10,7 +10,7 @@ function selectLimitedFriends($userID, $limit) {
     $stmt = prepareQuery("
         SELECT
             `userID`,
-            LEFT(`username`, 17) as `username`,
+            LEFT(`username`, 12) as `username`,
             LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 12) as `fullname`,
             IFNULL(
                 `profilepicture`,
@@ -50,7 +50,7 @@ function selectAllFriends($userID) {
     $stmt = prepareQuery("
         SELECT
             `userID`,
-            LEFT(`username`, 17) as `username`,
+            LEFT(`username`, 12) as `username`,
             LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 12) as `fullname`,
             IFNULL(
                 `profilepicture`,
@@ -85,7 +85,7 @@ function selectAllFriendRequests() {
     $stmt = prepareQuery("
         SELECT
             `userID`,
-            LEFT(`username`, 17) as `username`,
+            LEFT(`username`, 12) as `username`,
             LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 12) as `fullname`,
             IFNULL(
                 `profilepicture`,
@@ -236,7 +236,7 @@ function searchSomeFriends($n, $m, $search) {
     SELECT
             `userID`,
             
-            LEFT(`username`, 17) as `username`,
+            LEFT(`username`, 12) as `username`,
             LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 12) as `fullname`,
             IFNULL(
                 `profilepicture`,

website/queries/user.php

@@ -52,6 +52,10 @@ function selectUser($me, $other) {
           `username`,
           `birthdate`,
           `location`,
+          `showBday`,
+          `showEmail`,
+          `showProfile`,
+          `email`,
           IFNULL(
                 `profilepicture`,
                 '../img/avatar-standard.png'
@@ -345,7 +349,7 @@ function searchSomeUsers($n, $m, $search) {
     $stmt = prepareQuery("
     SELECT
         `userID`,
-        LEFT(`username`, 17) as `username`,
+        LEFT(`username`, 12) as `username`,
         IFNULL(
             `profilepicture`,
             '../img/avatar-standard.png'

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

@@ -29,7 +29,12 @@
         <h3>Informatie</h3>
         <p>
             <ul>
+                <?php if ($user["showBday"]) { ?>
                 <li>Leeftijd: <?= getAge($user["birthdate"]) ?> jaar</li>
+                <?php } ?>
+                <?php if ($user["showEmail"]) { ?>
+                    <li>Email: <?= $user["email"] ?></li>
+                <?php } ?>
                 <li>Locatie: <?= $user["location"] ?></li>
                 <li>Lid sinds: <?= nicetime($user["creationdate"]) ?></li>
             </ul>