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

@@ -24,14 +24,12 @@ $(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;
 
@@ -45,7 +43,6 @@ 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';
@@ -62,13 +59,11 @@ 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",
@@ -79,7 +74,6 @@ function adminSearch() {
     })
 }
 
-// AJAX live update.
 function adminUpdate(form) {
     $.post(
         "API/adminChangeUser.php",
@@ -89,7 +83,6 @@ function adminUpdate(form) {
     })
 }
 
-// AJAX pagenumber functionality.
 function updatePageN() {
     $.post(
         "API/adminPageNumber.php",
@@ -99,13 +92,11 @@ 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

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

website/public/js/masonry.js

@@ -91,21 +91,6 @@ $(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/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(!$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();

website/public/styles/adminpanel.css

@@ -1,15 +1,13 @@
+.admin-panel {
+    min-width: 800px;
+}
 
 .admin-panel input[type="radio"], input[type="checkbox"] {
     vertical-align: middle;
     height: 28px;
-    width: 28px;
     margin: 2px;
 }
 
-.table-checkbox {
-    width: 28px;
-}
-
 .admin-searchform {
     display: inline-block;
     width: 100%;
@@ -36,15 +34,13 @@
     width: 100%;
 }
 
-.table-checkbox {width: 20px}
+.usertable .table-username {width: 150px}
-.table-username {width: 150px}
+.usertable .table-status {width: 100px}
-.table-status {width: 100px}
+.usertable .table-action {width: 200px}
-.table-action {width: 200px}
 
 .usertable th, td {
     border-bottom: 1px solid #ddd;
     padding: 3px;
-    word-wrap: break-word;
 }
 
 .usertable th, tr {
@@ -55,10 +51,6 @@
     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,10 +224,12 @@ 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)
@@ -228,7 +238,9 @@ class lettersAndSpacesException extends Exception
     }
 }
 
-
+/**
+ * Class bdayException
+ */
 class bdayException extends Exception
 {
     public function __construct($message = "", $code = 0, Exception $previous = null)
@@ -237,6 +249,9 @@ class bdayException extends Exception
     }
 }
 
+/**
+ * Class usernameException
+ */
 class usernameException extends Exception
 {
     public function __construct($message = "", $code = 0, Exception $previous = null)
@@ -245,6 +260,9 @@ class usernameException extends Exception
     }
 }
 
+/**
+ * Class passwordException
+ */
 class passwordException extends Exception
 {
     public function __construct($message = "", $code = 0, Exception $previous = null)
@@ -253,6 +271,9 @@ class passwordException extends Exception
     }
 }
 
+/**
+ * Class confirmPasswordException
+ */
 class confirmPasswordException extends Exception
 {
     public function __construct($message = "", $code = 0, Exception $previous = null)
@@ -261,6 +282,9 @@ class confirmPasswordException extends Exception
     }
 }
 
+/**
+ * Class fbConfirmPasswordException
+ */
 class fbConfirmPasswordException extends Exception
 {
     public function __construct($message = "", $code = 0, Exception $previous = null)
@@ -269,6 +293,9 @@ class fbConfirmPasswordException extends Exception
     }
 }
 
+/**
+ * Class emailException
+ */
 class emailException extends Exception
 {
     public function __construct($message = "", $code = 0, Exception $previous = null)
@@ -277,6 +304,9 @@ class emailException extends Exception
     }
 }
 
+/**
+ * Class confirmEmailException
+ */
 class confirmEmailException extends Exception
 {
     public function __construct($message = "", $code = 0, Exception $previous = null)
@@ -285,6 +315,9 @@ class confirmEmailException extends Exception
     }
 }
 
+/**
+ * Class captchaException
+ */
 class captchaException extends Exception
 {
     public function __construct($message = "", $code = 0, Exception $previous = null)
@@ -293,6 +326,9 @@ class captchaException extends Exception
     }
 }
 
+/**
+ * Class registerException
+ */
 class registerException extends Exception
 {
     public function __construct($message = "", $code = 0, Exception $previous = null)

website/queries/createGroup.php

@@ -8,6 +8,7 @@ require_once "../queries/alerts.php";
  */
 function createGroup()
 {
+    // Creates the group.
     $createGroup = prepareQuery("
     INSERT INTO
         `group_page` (`name`, `description`)
@@ -17,6 +18,7 @@ function createGroup()
     $createGroup->bindValue(':description', test_input($_POST["bio"]));
     $createGroup->execute();
 
+    // Gets the groupID just created.
     $getGroupID = prepareQuery("
     SELECT
         `groupID`
@@ -28,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/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,6 +38,7 @@ function getUserID() {
 }
 
 function validateLogin($username, $password, $url){
+    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/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">Zichtbaarheid</th>
+    <th class="table-action">Actie</th>
 </tr>
 
 <?php

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

@@ -1,4 +1,5 @@
-<!-- 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");
@@ -126,11 +127,11 @@ if (isset($_GET["groupstatus"])) {
                     if ($userinfo == 'owner') {
                         echo "<button type=\"submit\" 
                                       name=\"batchactions\" 
-                                      id=\"batch-admin\" 
+                                      id=\"admin\" 
                                       value=\"admin\">Maak Admin</button>
                               <button type=\"submit\" 
                                       name=\"batchactions\" 
-                                      id=\"batch-owner\" 
+                                      id=\"owner\" 
                                       value=\"owner\">Maak Eigenaar</button>";
                     }
                     ?>
@@ -139,9 +140,9 @@ if (isset($_GET["groupstatus"])) {
                       onsubmit="adminUpdate(this);  return false;">
 
                     <input type="hidden" name="groupbatchactions" id="groupbatchinput">
-                    <button type="submit" name="batchactions" id="batch-hide" value="hidden">Verborgen</button>
+                    <button type="submit" name="batchactions" id="hide" value="hidden">Verborgen</button>
-                    <button type="submit" name="batchactions" id="batch-public" value="public">Publiek</button>
+                    <button type="submit" name="batchactions" id="ban" value="public">Publiek</button>
-                    <button type="submit" name="batchactions" id="batch-members" value="membersonly">Alleen Leden</button>
+                    <button type="submit" name="batchactions" id="members" value="membersonly">Alleen Leden</button>
                 </form>
             </div>
 
@@ -151,3 +152,5 @@ if (isset($_GET["groupstatus"])) {
         </div>
     </div>
 </div>
+</body>
+</html>

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/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"

website/views/profile.php

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