Fixed comments and links

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

@@ -21,8 +21,6 @@ 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"]) {
@@ -46,15 +44,6 @@ 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,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/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,6 +24,9 @@ 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,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 (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/settings.php

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

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}
-.table-username {width: 150px}
-.table-status {width: 100px}
-.table-action {width: 200px}
+.usertable .table-username {width: 150px}
+.usertable .table-status {width: 100px}
+.usertable .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

@@ -216,7 +216,6 @@ function test_input($data) {
     $data = trim($data);
     $data = stripslashes($data);
     $data = htmlspecialchars($data);
-    $data = trim($data);
     return $data;
 }
 

website/queries/connect.php

@@ -10,11 +10,6 @@ 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,10 +2,6 @@
 require_once "../queries/checkInput.php";
 require_once "../queries/picture.php";
 require_once "../queries/alerts.php";
-
-/**
- * Creates a group.
- */
 function createGroup()
 {
     $createGroup = prepareQuery("

website/queries/groupAdmin.php

@@ -1,9 +1,4 @@
 <?php
-/**
- * Gets the current settings for a group.
- * @param int $groupID
- * @return mixed
- */
 function getGroupSettings(int $groupID) {
     $stmt = prepareQuery("
     SELECT
@@ -20,12 +15,6 @@ 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"])) {
@@ -51,12 +40,6 @@ 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
@@ -77,40 +60,7 @@ function checkGroupAdmin(int $groupID, int $userID) : bool {
     return ($role == "admin");
 }
 
-/**
- * Returns all normal members for a group.
- * @param int $groupID
- * @return array|bool
- */
-function getAllGroupUsers(int $groupID) {
-    return getAllGroupMembers($groupID, 'member');
-}
-
-/**
- * Returns all admin for a group.
- * @param int $groupID
- * @return array|bool
- */
-function getAllGroupAdmins(int $groupID) {
-    return getAllGroupMembers($groupID, 'admin');
-}
-
-/**
- * Returns all Moderators for a group.
- * @param int $groupID
- * @return array|bool
- */
-function getAllGroupMods(int $groupID) {
-    return getAllGroupMembers($groupID, 'mod');
-}
-
-/**
- * Returns all members for a group specified by a string.
- * @param int $groupID
- * @param string $role
- * @return array|bool
- */
-function getAllGroupMembers(int $groupID, string $role) {
+function getAllGroupMembers(int $groupID) {
     $stmt = prepareQuery("
         SELECT
           `username`,
@@ -124,25 +74,16 @@ function getAllGroupMembers(int $groupID, string $role) {
         ON
           `group_member`.`userID` = `user`.`userID`
         WHERE
-          `groupID` = :groupID AND `group_member`.`role` = :role
+          `groupID` = :groupID AND `group_member`.`role` = 'member'
     ");
 
     $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");
@@ -165,28 +106,4 @@ function upgradeUser(int $groupID, int $userID, string $role) {
     } else {
         throw new AngryAlert("Er is iets mis gegaan");
     }
-}
-
-/**
- * Removes a group form the database.
- * @throws AngryAlert
- * @throws HappyAlert
- */
-function deleteGroup() {
-    if (!checkGroupAdmin($_POST["groupID"], $_SESSION["userID"])) {
-        throw new AngryAlert("Geen toestemming om de groep te verwijderen!");
-    }
-    $stmt = prepareQuery("
-    DELETE FROM
-        `group_page`
-    WHERE
-        `groupID` = :groupID
-    ");
-    $stmt->bindValue(":groupID", $_POST["groupID"]);
-    $stmt->execute();
-    if ($stmt->rowCount()) {
-        throw new HappyAlert("Group verwijderd!");
-    } else {
-        throw new AngryAlert("Er is iets mis gegaan");
-    }
 }

website/queries/register.php

@@ -1,5 +1,9 @@
 <?php
 
+/**
+ * Returns 1 if an username exists with the filled in username.
+ * @return int
+ */
 function getExistingUsername() {
     $stmt = prepareQuery("
     SELECT
@@ -16,6 +20,10 @@ function getExistingUsername() {
 
 }
 
+/**
+ * Returns 1 if an username exists with facebooklogin
+ * @return int
+ */
 function getExistingFBUsername() {
     $stmt = prepareQuery("
     SELECT
@@ -32,6 +40,10 @@ function getExistingFBUsername() {
 
 }
 
+/**
+ * Returns 1 if an email exists with the filled in email.
+ * @return int
+ */
 function getExistingEmail() {
     $stmt = prepareQuery("
     SELECT
@@ -48,6 +60,10 @@ function getExistingEmail() {
 
 }
 
+/**
+ * Returns 1 if an email exists with facebook register
+ * @return int
+ */
 function getExistingFBEmail() {
     $stmt = prepareQuery("
     SELECT
@@ -65,6 +81,10 @@ function getExistingFBEmail() {
 
 }
 
+/**
+ * Returns 1 if an email exists with the forgot email input
+ * @return int
+ */
 function getResetEmail() {
     $stmt = prepareQuery("
     SELECT
@@ -81,6 +101,9 @@ function getResetEmail() {
 
 }
 
+/**
+ * Registers a new account in the database
+ */
 function registerAccount() {
     $stmt = prepareQuery("
     INSERT INTO
@@ -119,6 +142,9 @@ function registerAccount() {
     $stmt->rowCount();
 }
 
+/**
+ * Registers a new account with facebook register
+ */
 function fbRegisterAccount() {
     $stmt = prepareQuery("
     INSERT INTO
@@ -158,6 +184,11 @@ 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,6 +1,10 @@
 <?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("
@@ -24,11 +28,16 @@ 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";
 
@@ -38,6 +47,11 @@ 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,10 +16,7 @@ function getSettings() {
       `location`,
       `birthdate`,
       `bio`,
-      IFNULL(
-                `profilepicture`,
-                '../img/avatar-standard.png'
-            ) AS profilepicture,
+      `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">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="batch-public" value="public">Publiek</button>
-                    <button type="submit" name="batchactions" id="batch-members" value="membersonly">Alleen Leden</button>
+                    <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>
                 </form>
             </div>
 
@@ -151,3 +152,5 @@ if (isset($_GET["groupstatus"])) {
         </div>
     </div>
 </div>
+</body>
+</html>

website/views/facebookRegisterModal.php

@@ -1,3 +1,9 @@
+<?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/groupAdmin.php

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

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();
-                $frienddif = $friendcount - 7;
-
-                for ($i = 0; $i < min($friendcount, 7); $i += 1) {
-                    $friend = $profile_friends->fetch();
+                while($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();
-                $groupdif = $groupcount - 7;
-
-                for ($i = 0; $i < min($groupcount, 7); $i += 1) {
-                    $group = $profile_groups->fetch();
+                while($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>";
                 }