Merge branch 'master' into hendrik-post

2017-02-01 11:49:41 +01:00
parent ee204d78a7 028c2373c1
commit 6a9e36cea2
83 changed files with 2810 additions and 1142 deletions
--- a/website/public/.htaccess
+++ b/website/public/.htaccess
@@ -1,7 +1,7 @@
 Options +FollowSymLinks
 RewriteEngine On

-ErrorDocument 404 /error404.jpg
+ErrorDocument 404 /error/404.php

 RewriteCond %{SCRIPT_FILENAME} !-d
 RewriteCond %{SCRIPT_FILENAME} !-f
--- a/website/public/API/adminChangeUser.php
+++ b/website/public/API/adminChangeUser.php
@@ -0,0 +1,25 @@
+<?php
+session_start();
+
+require_once ("../../queries/connect.php");
+require_once ("../../queries/checkInput.php");
+require_once ("../../queries/user.php");
+require_once ("../../queries/group_page.php");
+
+$userinfo = getRoleByID($_SESSION['userID']);
+
+if (isset($_POST["actions"]) && isset($_POST["userID"])) {
+    changeUserStatusByID($_POST["userID"], $_POST["actions"]);
+} else if (isset($_POST["actions"]) && isset($_POST["groupID"])) {
+    changeGroupStatusByID($_POST["groupID"], $_POST["actions"]);
+} else if (isset($_POST["batchactions"]) && isset($_POST["checkbox-user"])) {
+    if ($userinfo == 'owner') {
+        changeMultipleUserStatusByID($_POST["checkbox-user"], $_POST["batchactions"]);
+    } else {
+        changeMultipleUserStatusByIDAdmin($_POST["checkbox-user"], $_POST["batchactions"]);
+    }
+} else if (isset($_POST["groupbatchactions"]) && isset($_POST["checkbox-group"])) {
+    changeMultipleGroupStatusByID($_POST["checkbox-group"], $_POST["groupbatchactions"]);
+} else if (isset($_POST['bancommentuserID']) && isset($_POST['bancommenttext'])) {
+    editBanCommentByID($_POST['bancommentuserID'], $_POST['bancommenttext']);
+}
--- a/website/public/API/adminPageNumber.php
+++ b/website/public/API/adminPageNumber.php
@@ -0,0 +1,38 @@
+<?php
+
+session_start();
+
+require_once ("../../queries/connect.php");
+require_once ("../../queries/checkInput.php");
+require_once ("../../queries/user.php");
+require_once ("../../queries/group_page.php");
+
+$search = "";
+if (isset($_POST["search"])) {
+    $search = test_input($_POST["search"]);
+}
+
+$pagetype = "user";
+if (isset($_POST['pagetype'])) {
+    $pagetype = test_input($_POST['pagetype']);
+}
+
+$status = array();
+if (isset($_POST['status'])) {
+    $status = $_POST["status"];
+}
+
+$groupstatus = array();
+if (isset($_POST['groupstatus'])) {
+    $groupstatus = $_POST["groupstatus"];
+}
+
+$entries = 20;
+$currentpage = 1;
+if (isset($_POST['currentpage'])) {
+    $currentpage = (int) test_input($_POST["currentpage"]);
+}
+
+$offset = (int) $currentpage * $entries - $entries;
+
+include ("../../views/adminpanel-page.php");
--- a/website/public/API/adminSearchUsers.php
+++ b/website/public/API/adminSearchUsers.php
@@ -0,0 +1,44 @@
+<?php
+
+session_start();
+
+require_once ("../../queries/connect.php");
+require_once ("../../queries/checkInput.php");
+require_once ("../../queries/user.php");
+require_once ("../../queries/group_page.php");
+
+$offset = 0;
+$entries = 20;
+if (isset($_POST["currentpage"])) {
+    $offset = (int) test_input($_POST["currentpage"]) * $entries - $entries;
+}
+
+$search = "";
+if (isset($_POST["search"])) {
+    $search = test_input($_POST["search"]);
+}
+
+$pagetype = "user";
+if (isset($_POST['pagetype'])) {
+    $pagetype = test_input($_POST['pagetype']);
+}
+
+$status = array();
+if (isset($_POST['status'])) {
+    $status = $_POST["status"];
+}
+
+$groupstatus = array();
+if (isset($_POST['groupstatus'])) {
+    $groupstatus = $_POST["groupstatus"];
+}
+
+$userinfo = getRoleByID($_SESSION['userID']);
+
+if ($pagetype == "user") {
+    include ("../../views/adminpanel-table.php");
+} else if ($pagetype == "group") {
+    include ("../../views/adminpanel-grouptable.php");
+} else {
+    echo "Search failed!";
+}
--- a/website/public/API/getPosts.php
+++ b/website/public/API/getPosts.php
@@ -1,13 +1,17 @@
 <?php

-if(empty($_POST["usr"])) {
+if(empty($_POST["usr"]) and empty($_POST["grp"])) {
    header('HTTP/1.1 500 Non enough arguments');
 }

-require_once ("../../queries/user.php");
+require_once ("../../queries/post.php");
 require_once ("../../queries/nicetime.php");

-$posts = selectAllUserPosts($_POST["usr"]);
+if(empty($_POST["usr"])) {
+    $posts = selectAllPosts(0, $_POST["grp"]);
+} else {
+    $posts = selectAllPosts($_POST["usr"], 0);
+}

 if(!$posts) {
    header('HTTP/1.1 500 Query failed');
@@ -19,6 +23,4 @@ for($i = 0; $i < sizeof($results); $i++) {
    $results[$i]["nicetime"] = nicetime($results[$i]["creationdate"]);
 }

-//$results[0]["niceTime"] = nicetime($results[0]["creationdate"]);
-
 echo json_encode($results);
--- a/website/public/API/loadFriendRequest.php
+++ b/website/public/API/loadFriendRequest.php
@@ -4,5 +4,12 @@ session_start();

 require_once ("../../queries/connect.php");
 require_once ("../../queries/friendship.php");
+require_once ("../../queries/user.php");

-echo selectAllFriendRequests();
+if (isset($_SESSION["userID"]) &&
+    getRoleByID($_SESSION["userID"]) != 'frozen' &&
+    getRoleByID($_SESSION["userID"]) != 'banned') {
+    echo selectAllFriendRequests();
+} else {
+    echo "[]";
+}
--- a/website/public/API/loadFriends.php
+++ b/website/public/API/loadFriends.php
@@ -6,11 +6,15 @@ require_once ("../../queries/connect.php");
 require_once ("../../queries/checkInput.php");
 require_once ("../../queries/friendship.php");

-if (isset($_POST["limit"])) {
-    echo selectLimitedFriends($_SESSION["userID"], (int) test_input($_POST["limit"]));
-} else if (isset($_GET["limit"])) {
-    echo selectLimitedFriends($_SESSION["userID"], (int) test_input($_GET["limit"]));
+if (isset($_SESSION["userID"])) {
+    if (isset($_POST["limit"])) {
+        echo selectLimitedFriends($_SESSION["userID"], (int)test_input($_POST["limit"]));
+    } else if (isset($_GET["limit"])) {
+        echo selectLimitedFriends($_SESSION["userID"], (int)test_input($_GET["limit"]));
+    } else {
+        echo selectFriends($_SESSION["userID"]);
+    }
 } else {
-    echo selectFriends($_SESSION["userID"]);
+    echo "[]";
 }

--- a/website/public/API/nietSlecht.php
+++ b/website/public/API/nietSlecht.php
@@ -0,0 +1,41 @@
+<?php
+
+session_start();
+require_once ("../queries/connect.php");
+require_once ("../queries/checkInput.php");
+
+function getNietSlechtCountForPost(int $postID) : int {
+    $stmt = prepareQuery("
+    SELECT 
+        `userID`
+    FROM 
+        `niet_slecht`
+    WHERE
+        `postID` = :postID
+    ");
+    $stmt->bindParam(":postID", $postID);
+    $stmt->execute();
+    return $stmt->rowCount();
+}
+
+function getNietSlechtUsersForPost(int $postID) {
+    $stmt = prepareQuery("
+    SELECT
+      `fname`,
+      `lname`,
+      CONCAT(`user`.`fname`, ' ', `user`.`lname`) as `fullname`
+    FROM
+      `user`
+    INNER JOIN
+      `niet_slecht`
+    WHERE
+      `user`.`userID` = `niet_slecht`.`userID` AND
+        `niet_slecht`.`postID` = :postID
+    ");
+    $stmt->bindParam(":postID", $postID);
+    $stmt->execute();
+    $rows = $stmt->fetchAll();
+    foreach ($rows as $row) {
+        print($row["fullname"]);
+    }
+}
--- a/website/public/API/postComment.php
+++ b/website/public/API/postComment.php
@@ -2,17 +2,36 @@

 session_start();

-require("../../queries/post.php");
-require("../../queries/connect.php");
-require("../../queries/checkInput.php");
-if (empty($_POST['newcomment-content'])) {
-    echo 0;
-} else {
-    if(makeComment(test_input($_POST['postID']),
-        $_SESSION['userID'],
-        test_input($_POST['newcomment-content']))) {
-        echo 1;
+require_once("../../queries/post.php");
+require_once("../../queries/connect.php");
+require_once("../../queries/checkInput.php");
+require_once("../../queries/user.php");
+
+
+if (isset($_SESSION["userID"]) &&
+    getRoleByID($_SESSION["userID"]) != 'frozen' &&
+    getRoleByID($_SESSION["userID"]) != 'banned') {
+    if ($_POST['button'] == 'reaction') {
+        if (empty($_POST['newcomment-content'])) {
+            echo 0;
+        } else {
+            if (makeComment($_POST['postID'],
+                $_SESSION['userID'],
+                test_input($_POST['newcomment-content']))) {
+                echo 1;
+            } else {
+                echo 0;
+            }
+        }
+    } else if ($_POST['button'] == 'nietslecht') {
+        if (makeNietSlecht($_POST["postID"], $_SESSION["userID"])) {
+            echo 1;
+        } else {
+            echo 0;
+        }
    } else {
        echo 0;
    }
+} else {
+    echo "frozen";
 }
--- a/website/public/API/postPost.php
+++ b/website/public/API/postPost.php
@@ -2,16 +2,53 @@

 session_start();

-require("../../queries/post.php");
-require("../../queries/connect.php");
-require("../../queries/checkInput.php");
+require_once("../../queries/post.php");
+require_once("../../queries/group_page.php");
+require_once("../../queries/connect.php");
+require_once("../../queries/checkInput.php");

-if (empty($_POST['newpost-title'])) {
-} else {
-    makePost($_SESSION['userID'],
-             null,
-             test_input($_POST['newpost-title']),
-             test_input($_POST['newpost-content']));
+if (empty($_POST["title"]) or
+    empty($_POST["content"]) or
+    empty($_SESSION["userID"])) {
+    header('HTTP/1.1 500 Non enough arguments');
 }

-header("Location: ../profile.php");
+if (empty($_POST["group"])) {
+    // User Post
+    makePost(
+        $_SESSION["userID"],
+        null,
+        test_input($_POST["title"]),
+        test_input($_POST["content"])
+        );
+} else {
+    // Group Post
+
+    // Check if the user is an admin or mod of the group.
+    if(!in_array(selectGroupRole($_POST["group"]), array('mod', 'admin'))) {
+        header('HTTP/1.1 500 Non enough rights');
+        return;
+    }
+
+    makePost(
+        $_SESSION["userID"],
+        $_POST["group"],
+        test_input($_POST["title"]),
+        test_input($_POST["content"])
+    );
+}
+
+
+
+
+
+
+//if (empty($_POST['newpost-title'])) {
+//} else {
+//    makePost($_SESSION['userID'],
+//             null,
+//             test_input($_POST['newpost-title']),
+//             test_input($_POST['newpost-content']));
+//}
+//
+//header("Location: ../profile.php");
--- a/website/public/API/searchPageNumber.php
+++ b/website/public/API/searchPageNumber.php
@@ -0,0 +1,41 @@
+<?php
+
+session_start();
+
+require_once ("../../queries/connect.php");
+require_once ("../../queries/checkInput.php");
+require_once ("../../queries/user.php");
+require_once ("../../queries/group_page.php");
+
+$user_perpage = $group_perpage = 20;
+
+$user_currentpage = $group_currentpage = 1;
+if (isset($_POST['user-pageselect'])) {
+    $user_currentpage = test_input($_POST['user-pageselect']);
+}
+if (isset($_POST['group-pageselect'])) {
+    $group_currentpage = test_input($_POST['group-pageselect']);
+}
+
+$user_n = $user_currentpage * $user_perpage - $user_perpage;
+$group_n = $group_currentpage * $group_perpage - $group_perpage;
+
+$search = "";
+if (isset($_POST['search'])) {
+    $search = test_input($_POST['search']);
+}
+
+$user_count = countSomeUsers($search)->fetchColumn();
+$group_count = countSomeGroups($search)->fetchColumn();
+
+$filter = "all";
+if (isset($_POST['filter'])) {
+    $filter = test_input($_POST['filter']);
+}
+
+$option = "user";
+if (isset($_POST['option'])) {
+    $option = test_input($_POST['option']);
+}
+
+include ("../../views/searchPageNumber.php");
--- a/website/public/API/searchUsers.php
+++ b/website/public/API/searchUsers.php
@@ -8,13 +8,15 @@ require_once ("../../queries/friendship.php");
 require_once ("../../queries/user.php");

 $n = 0;
-if (isset($_POST["n"])) {
-    $n = (int) test_input($_POST["n"]);
-}
 $m = 20;
-if (isset($_POST["m"])) {
-    $m = (int) test_input($_POST["m"]);
+
+$page = 1;
+if (isset($_POST["user-pageselect"])) {
+    $page = (int) test_input($_POST['user-pageselect']);
 }
+
+$n = ($page - 1) * $m;
+
 $search = "";
 if (isset($_POST["search"])) {
    $search = test_input($_POST["search"]);
--- a/website/public/API/sendMessage.php
+++ b/website/public/API/sendMessage.php
@@ -4,14 +4,22 @@ session_start();
 require_once("../../queries/connect.php");
 require_once("../../queries/private_message.php");
 require_once("../../queries/checkInput.php");
+require_once("../../queries/user.php");

-if (!empty(test_input($_POST["destination"])) &&
-    !empty(test_input($_POST["content"]))) {
-    if (sendMessage(test_input($_POST["destination"]), test_input($_POST["content"]))) {
-        echo 1;
+if (isset($_SESSION["userID"]) &&
+    getRoleByID($_SESSION["userID"]) != 'frozen' &&
+    getRoleByID($_SESSION["userID"]) != 'banned') {
+    if (!empty(test_input($_POST["destination"])) &&
+        !empty(test_input($_POST["content"]))
+    ) {
+        if (sendMessage(test_input($_POST["destination"]), test_input($_POST["content"]))) {
+            echo 1;
+        } else {
+            echo 0;
+        }
    } else {
        echo 0;
    }
 } else {
-    echo 0;
+    echo "frozen";
 }
--- a/website/public/admin.php
+++ b/website/public/admin.php
@@ -1,10 +1,14 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <?php include("../views/head.php"); ?>
+    <?php
+    require_once ("../queries/user.php");
+    require_once ("../queries/group_page.php");
+    require_once ("../views/head.php"); ?>
    <style>
        @import url("styles/adminpanel.css");
    </style>
+<script src="js/admin.js" charset="utf-8"></script>
 </head>
 <body>
 <?php
@@ -12,6 +16,15 @@
 * This view adds the main layout over the screen.
 * Header and menu.
 */
+include_once ("../queries/user.php");
+
+// auth
+$role = getRoleByID($_SESSION['userID']);
+
+if ($role != 'admin' AND $role != 'owner') {
+    header("location:profile.php");
+}
+
 include("../views/main.php");

 /* Add your view files here. */
--- a/website/public/bits/friend-item.php
+++ b/website/public/bits/friend-item.php
@@ -21,7 +21,7 @@ $friends = json_decode($_POST["friends"]);
 foreach($friends as $i => $friend) {
    $friendshipStatus = getFriendshipStatus($friend->userID);
    ?>
-    <li class='friend-item <?= $extra ?>'>
+    <li class='friend-item'>
        <form action='<?= $action ?>' method='<?= $actionType ?>'>
            <button type='submit'
                    name='username'
@@ -33,7 +33,7 @@ foreach($friends as $i => $friend) {
                    }
                    ?>'>
                <div class='friend'>
-                    <img alt='PF' class='profile-picture' src='<?= $friend->profilepicture ?>'/>
+                    <img alt='PF' class='profile-picture <?= $friend->onlinestatus ?>' src='<?= $friend->profilepicture ?>'/>
                    <div class='friend-name'>
                        <?= $friend->fullname ?><br/>
                        <span style='color: #666'><?php
--- a/website/public/emailconfirm.php
+++ b/website/public/emailconfirm.php
@@ -2,7 +2,7 @@
 include_once("../queries/connect.php");
 include_once("../views/messagepage.php");
 if (array_key_exists("u", $_GET) and array_key_exists("h", $_GET)) {
-   $checkHash = $GLOBALS["db"]->prepare("
+   $checkHash = prepareQuery("
   SELECT
      `email`,
      `role`
@@ -28,7 +28,7 @@ if (array_key_exists("u", $_GET) and array_key_exists("h", $_GET)) {

 function doActivate(string $email) {
    if (password_verify($email, $_GET["h"])) {
-        $confirmUser = $GLOBALS["db"]->prepare("
+        $confirmUser = prepareQuery("
        UPDATE
            `user`
        SET
--- a/website/public/error/404.php
+++ b/website/public/error/404.php
@@ -0,0 +1,9 @@
+<?php
+require_once "../../views/messagepage.php";
+
+messagePage("
+<div class='error-page'>
+    <h1>404</h1>
+    <h4>Verkeerde link...</h4><br />
+    <img height='25%' width='25%' src='../img/zelda.png'>
+</div>");
--- a/website/public/group.php
+++ b/website/public/group.php
@@ -4,10 +4,23 @@
    <?php include("../views/head.php"); ?>
    <style>
        @import url("styles/profile.css");
+        @import url("styles/post-popup.css");
+        @import url('https://fonts.googleapis.com/css?family=Anton');
    </style>
 </head>
 <body>
 <?php
+
+include_once("../queries/group_page.php");
+
+$group = selectGroupByName($_GET["groupname"]);
+$members = selectGroupMembers(2);
+
+?>
+<script>alert("<?= $members[0] ?>");</script>
+<script>alert("<?= $members[1] ?>");</script>
+<?php
+
 /*
 * This view adds the main layout over the screen.
 * Header, menu, footer.
@@ -19,6 +32,23 @@ include("../views/group.php");

 /* This adds the footer. */
 include("../views/footer.php");
+
+$masonry_mode = 0;
+if ($group["role"] == "mod" OR $group["role"] == "admin") {
+    $masonry_mode = 2;
+}
 ?>
+
+<script src="js/masonry.js"></script>
+<script src="js/post.js"></script>
+<script>
+    $(document).ready(function() {
+        userID = 0;
+        groupID = <?= $group["groupID"] ?>;
+
+        masonry(<?= $masonry_mode ?>);
+    });
+</script>
+
 </body>
 </html>
--- a/website/public/img/zelda.png
+++ b/website/public/img/zelda.png
--- a/website/public/js/admin.js
+++ b/website/public/js/admin.js
@@ -1,30 +1,48 @@
-window.onload = function() {
+$(window).on("load", function () {
    changeFilter();
-};
+    searchFromOne();

-function checkAll(allbox) {
-    var checkboxes = document.getElementsByClassName('checkbox-list');
+    $(".admin-searchinput").keyup(function(){
+        searchFromOne();
+    });
+    // all inputs and labels directly under admin filter and groupfilter
+    $("#admin-filter, #admin-groupfilter > input, label").change(function(){
+        searchFromOne();
+    });
+    $("#pagetype").change(function(){
+        searchFromOne();
+    });

-    for (var i = 0; i < checkboxes.length; i++) {
-        if (checkboxes[i].type == 'checkbox') {
-            checkboxes[i].checked = allbox.checked;
-        }
-    }
+    /* Update hidden input to be equal to submit pressed,
+        because serialize doesn't take submit values. */
+    $('#admin-batchform > button').click(function () {
+        $('#batchinput').prop('value', $(this).prop('value'));
+        console.log($('#batchinput').prop('value'));
+    });
+
+    $('#admin-groupbatchform > button').click(function () {
+        $('#groupbatchinput').prop('value', $(this).prop('value'));
+        console.log($('#batchinput').prop('value'));
+    });
+});
+
+function checkAll() {
+    $('.checkbox-list').each(function () {
+        $(this).prop('checked', $('#checkall').prop('checked'));
+    });
 }

-function checkCheckAll(allbox) {
-    var checkboxes = document.getElementsByClassName('checkbox-list');
+function checkCheckAll() {
    var checked = true;

-    for (var i = 0; i < checkboxes.length; i++) {
-        if (checkboxes[i].type == 'checkbox') {
-            if (checkboxes[i].checked == false) {
-                checked = false;
-                break;
-            }
+    $('.checkbox-list').each(function () {
+        if ($(this).prop('checked') == false) {
+            checked = false;
+            return;
        }
-    }
-    allbox.checked = checked;
+    });
+
+    $('#checkall').prop('checked', checked);
 }

 function changeFilter() {
@@ -32,13 +50,61 @@ function changeFilter() {
        document.getElementById('admin-filter').style.display = 'none';
        document.getElementById('admin-groupfilter').style.display = 'inline-block';

-        document.getElementById('admin-batchactions').style.display = 'none';
-        document.getElementById('admin-groupbatchactions').style.display = 'inline-block';
+        document.getElementById('admin-batchform').style.display = 'none';
+        document.getElementById('admin-groupbatchform').style.display = 'inline-block';
    } else {
        document.getElementById('admin-filter').style.display = 'inline-block';
        document.getElementById('admin-groupfilter').style.display = 'none';

-        document.getElementById('admin-batchactions').style.display = 'inline-block';
-        document.getElementById('admin-groupbatchactions').style.display = 'none';
+        document.getElementById('admin-batchform').style.display = 'inline-block';
+        document.getElementById('admin-groupbatchform').style.display = 'none';
    }
 }
+
+function searchFromOne() {
+    $('#currentpage').prop('value', 1);
+    adminSearch();
+}
+
+function adminSearch() {
+    console.log($("#admin-searchform").serialize());
+    $.post(
+        "API/adminSearchUsers.php",
+        $("#admin-searchform").serialize()
+    ).done(function (data) {
+        $("#usertable").html(data);
+        updatePageN();
+    })
+}
+
+function adminUpdate(form) {
+    $.post(
+        "API/adminChangeUser.php",
+        $(form).serialize()
+    ).done(function () {
+        adminSearch();
+    })
+}
+
+function updatePageN() {
+    $.post(
+        "API/adminPageNumber.php",
+        $("#admin-searchform").serialize()
+    ).done(function (data) {
+        $("#admin-pageinfo").html(data);
+    })
+}
+
+function toggleBancomment(button) {
+    $(button).siblings("div").toggle();
+    $(button).toggle();
+}
+
+function editComment(form) {
+    $.post(
+        "API/adminChangeUser.php",
+        $(form).serialize()
+    ).done(function (data) {
+        adminSearch();
+    });
+}
--- a/website/public/js/chat.js
+++ b/website/public/js/chat.js
@@ -1,23 +1,31 @@
+var previousDate = new Date("1970-01-01 00:00:00");
+var previousTime = "00:00";
+var gettingMessages = false;
+var previousType = "robot";
+
 $(document).ready(function() {
-    loadMessages();
+    setInterval(loadMessages, 1000);
    sayEmpty();
    $(".chat-field").hide();
 });

 function loadMessages() {
-    $.post(
-        "API/loadMessages.php",
-        $("#lastIDForm").serialize()
-    ).done(function(data) {
-        if (data && data != "[]") {
-            messages = JSON.parse(data);
-            addMessages(messages);
-            $("#lastID").val(messages[messages.length - 1].messageID);
-            $("#chat-history").scrollTop($("#chat-history")[0].scrollHeight);
-        }
-    });
-
-    setTimeout(loadMessages, 1000);
+    if (!gettingMessages) {
+        gettingMessages = true;
+        $.post(
+            "API/loadMessages.php",
+            $("#lastIDForm").serialize()
+        ).done(function (data) {
+            if (data && data != "[]") {
+                messages = JSON.parse(data);
+                addMessages(messages);
+                $("#lastID").val(messages[messages.length - 1].messageID);
+            }
+            gettingMessages = false;
+        });
+    } else {
+        setTimeout(loadMessages, 500);
+    }
 }


@@ -25,30 +33,75 @@ function sendMessage() {
    $.post(
        "API/sendMessage.php",
        $("#sendMessageForm").serialize()
-    );
+    ).done(function(response) {
+        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.");
+        }
+    });

    $("#newContent").val("");
+    loadMessages();
 }

 function addMessages(messages) {
-    for(i in messages) {
+    var messagesText = "";
+    for(var i in messages) {
+        // Initialize message variables
+        var thisDate = new Date(messages[i].creationdate);
+        var thisTime = thisDate.getHours() + ":" + thisDate.getMinutes();
+        var type;
+        thisDate.setHours(0,0,0,0);
+
        if (messages[i].destination == $(".destinationID").val()) {
            type = "chat-message-self";
        } else {
            type = "chat-message-other";
        }
+        if (i == 0) {
+            if (thisDate > previousDate) {
+                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 + '">';
+        } else if (type != previousType || thisTime != previousTime || thisDate > previousDate) {
+            messagesText += '<div class="chat-time">\
+                    ' + thisTime + '\
+                    </div></div></div>';

-        $("#chat-history").append('\
-            <div class="chat-message"> \
-                <div class="' + type + '">\
-                ' + messages[i].content + '\
-                </div> \
-            </div>\
-        ');
+            previousTime = thisTime;
+            previousType = type;
+            if (thisDate > previousDate) {
+                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 + '">';
+        }
+        messagesText += fancyText(messages[i].content) + "<br />";
    }
+
+    // Close the last message
+    messagesText += '<div class="chat-time">\
+                    ' + thisTime + '\
+                    </div></div></div>';
+
+    $("#chat-history").append(messagesText);
+
+    $("#chat-history").scrollTop($("#chat-history")[0].scrollHeight - $('#chat-history')[0].clientHeight);
 }

 function switchUser(userID) {
+    previousDate = new Date("1970-01-01 00:00:00");
    $(".chat-field").show();
    $(".destinationID").val(userID);
    $("#chat-history").html("");
@@ -58,5 +111,5 @@ function switchUser(userID) {
 }

 function sayEmpty() {
-    $("#chat-history").html("Begin nu met chatten!");
+    $("#chat-history").html("Probeer ook eens foto's en video's te sturen");
 }
--- a/website/public/js/friendButtons.js
+++ b/website/public/js/friendButtons.js
@@ -1,24 +1,70 @@
 function placeFriendButtons() {
    $.post("API/getFriendshipStatus.php", { usr: userID })
        .done(function(data) {
-            friendshipStatus = data;
-            $buttonContainer = $("div.friend-button-container");
-            $buttonContainer.children().remove();
-            if (friendshipStatus == -1) {
-                return;
-            } else if(friendshipStatus == 0) {
-                $buttonContainer.append($("<button class=\"green friend-button\" value=\"request\"><i class=\"fa fa-handshake-o\"></i> Bevriend</button>"));
-            } else if(friendshipStatus == 1) {
-                $buttonContainer.append($("<button class=\"red friend-button\" value=\"delete\"><i class=\"fa fa-times\"></i> Verwijder</button>"));
-            } else if(friendshipStatus == 2) {
-                $buttonContainer.append($("<button class=\"red friend-button\" value=\"delete\"><i class=\"fa fa-times\"></i> Trek verzoek in</button>"));
-            } else if(friendshipStatus == 3) {
-                $buttonContainer.append($("<button class=\"red friend-button\" value=\"delete\"><i class=\"fa fa-times\"></i> Weiger</button>"));
-                $buttonContainer.append($("<button class=\"green friend-button\" value=\"accept\"><i class=\"fa fa-check\"></i> Accepteer</button>"));
-            }
+            var friendshipStatus = data;
+            var $buttonContainer = $("div.friend-button-container");
+            $("#start-profile-chat").hide();
+                $buttonContainer.html("");
+                var value1 = "";
+                var class1 = "empty-button";
+                var icon1 = "";
+                var text1 = "";
+
+                var value2 = "";
+                var class2 = "empty-button";
+                var icon2 = "";
+                var text2 = "";
+
+                switch (friendshipStatus) {
+                    case "0":
+                        value1 = "request";
+                        class1 = "green";
+                        text1 = "Bevriend";
+                        icon1 = "fa-handshake-o";
+                        break;
+                    case "1":
+                        value1 = userID;
+                        class1 = "green";
+                        text1 = "Chat";
+                        icon1 = "fa-comment-o";
+                        value2 = "delete";
+                        class2 = "red";
+                        text2 = "Verwijder";
+                        icon2 = "fa-times";
+                        break;
+                    case "2":
+                        value1 = "delete";
+                        class1 = "red";
+                        text1 = "Trek verzoek in";
+                        icon1 = "fa-cross";
+                        break;
+                    case "3":
+                        value1 = "accept";
+                        class1 = "green";
+                        text1 = "Accepteer";
+                        icon1 = "fa-check";
+                        value2 = "delete";
+                        class2 = "red";
+                        text2 = "Weiger";
+                        icon2 = "fa-times";
+                        break;
+                }
+
+                $buttonContainer.append(
+                    "<button class='"+ class1 +" friend-button' value='"+ value1 +"'>" +
+                        "<i class='fa "+ icon1 +"'></i> " + text1 +
+                    "</button>");
+                $buttonContainer.append(
+                    "<button class='"+ class2 +" friend-button' value='"+ value2 +"'>" +
+                        "<i class='fa "+ icon2 +"'></i> " + text2 +
+                    "</button>");
+

            $buttonContainer.children().click(function() {
-                editFriendship(userID, this.value);
+                if (isNaN(this.value))
+                    editFriendship(userID, this.value);
+                else if (this.value != "")
+                    window.location.href = "chat.php?username=" + this.value;
            });
        });
 }
--- a/website/public/js/header.js
+++ b/website/public/js/header.js
@@ -1,19 +1,40 @@
 $(document).ready(function() {
-
    // Toggle menu
    $("#own-profile-picture, #open-notifications").click(function() {
-        if ($("#notification-center").css('right') == "-256px") {
-            // Make the menu visible and move the content to the left.
-            $("#chat-history").width("calc(100% - 587px)");
-            $(".modal").width("calc(100% - 512px)");
-            $(".content").css("margin-right", "256px");
-            $("#notification-center").css("right", "0px");
-        } else {
-            // Make the menu invisible and move the content to the right.
-            $("#chat-history").width("calc(100% - 331px)");
-            $(".modal").width("calc(100% - 256px)");
-            $(".content").css("margin-right", "0px");
-            $("#notification-center").css("right", "-256px");
-        }
+            if ($("#notification-center").css('display') == "none") {
+                // Make the menu visible and move the content to the left.
+                $(".modal").width("calc(100% - 512px)");
+                $(".content").css("margin-right", "256px");
+                $("#notification-center").css("right", "0px");
+                $("#notification-center").css("display", "block");
+                $("#contact-menu").css("display", "block");
+
+                // Add cookie so the menu stays open on other pages
+                if (window.innerWidth > 1080) {
+                    $("#chat-history").width("calc(100% - 587px)");
+                    document.cookie = "menu=open; path=/";
+                } else {
+                    document.cookie = "menu=closed; path=/";
+                }
+            } else {
+                $(".modal").width("calc(100% - 256px)");
+                $(".content").css("margin-right", "0px");
+                $("#notification-center").css("display", "none");
+
+                if (window.innerWidth > 1080) {
+                    $("#chat-history").width("calc(100% - 331px)");
+                } else {
+                    // Make the menu invisible and move the content to the right.
+                    $("#contact-menu").css("display", "none");
+                }
+
+                // Change menu cookie to close
+                document.cookie = "menu=closed; path=/";
+
+            }
    });
+
+    if (getCookie("menu") == "open") {
+        $("#own-profile-picture").click();
+    }
 });
--- a/website/public/js/main.js
+++ b/website/public/js/main.js
@@ -1,3 +1,54 @@
+var days = ["zondag", "maandag", "dinsdag", "woensdag", "donderdag", "vrijdag", "zaterdag"];
+var months = ["januari", "februari", "maart", "april", "mei", "juni", "juli", "augustus", "september", "oktober", "november", "december"]
+
+function fancyText(text) {
+    // Add links, images, gifs and (youtube) video's.
+    var regex = /(https?:\/\/.[^ <>"]*)/ig;
+    text = text.replace(regex, function(link) {
+        // Add images
+        if (link.match(/(https?:\/\/.[^ ]*\.(?:png|jpg|jpeg|gif))/ig)) {
+            return "<img alt='" + link + "' src='" + link + "' />";
+        }
+        // Add mp4 video's
+        else if (link.match(/(https?:\/\/.[^ ]*\.(?:mp4))/ig)) {
+            return "<video width='100%'>" +
+                        "<source src='"+ link +"' type='video/mp4'>" +
+                        "<b>Je browser ondersteund geen video</b>" +
+                "</video><button class='gray' onclick='$(this).prev().get(0).play();'>Speel af</button>";
+        }
+        // Add ogg video's
+        else if (link.match(/(https?:\/\/.[^ ]*\.(?:ogg))/ig)) {
+            return "<video width='100%'>" +
+                "<source src='"+ link +"' type='video/ogg'>" +
+                "<b>Je browser ondersteund geen video</b>" +
+                "</video><button onclick='$(this).prev().get(0).play();'>Speel af</button>";
+        }
+        // Add youtube video's
+        else if (link.match(/(https?:\/\/.(www.)?youtube|youtu.be)*watch/ig)) {
+            return '<iframe width="100%"' +
+                    ' src="https://www.youtube.com/embed/' + link.substr(link.length - 11) +
+                    '" frameborder="0" allowfullscreen></iframe>';
+        }
+        // Add links
+        else {
+            return "<a href='" + link + "'>" + link + "</a>";
+        }
+    });
+
+    return text;
+}
+
+function getCookie(key) {
+    cookies = document.cookie.split("; ");
+    for (var i in cookies) {
+        cookie = cookies[i].split("=");
+        if (cookie[0] == key) {
+            return cookie[1];
+        }
+    }
+    return false;
+}
+
 function editFriendship(userID, value) {
    $.post("API/editFriendship.php", { usr: userID, action: value })
    .done(function() {
@@ -42,4 +93,14 @@ function showGroups(groups, list) {
    } else {
        return false;
    }
-}
+}
+
+$(document).ready(function() {
+    $("body").delegate("textarea[maxlength]", "keydown", function() {
+        if ($(this).val().length / .9 >= $(this).attr("maxlength")) {
+            $(this).next().text($(this).val().length + "/" + $(this).attr("maxlength"));
+        } else {
+            $(this).next().text("");
+        }
+    });
+});
--- a/website/public/js/masonry.js
+++ b/website/public/js/masonry.js
@@ -19,10 +19,32 @@ function requestPost(postID) {
        var scrollBarWidth = window.innerWidth - document.body.offsetWidth;
        scrollbarMargin(scrollBarWidth, 'hidden');
        $('#modal-response').show();
-        $('#modal-response').html(data);
+        $('#modal-response').html(fancyText(data));
    });
 }

+function postPost() {
+    title = $("input.newpost[name='title']").val();
+    content = $("textarea.newpost[name='content']").val();
+
+    if (masonryMode == 2) {
+        $.post("API/postPost.php", { title: title,
+                                     content : content,
+                                     group : groupID })
+            .done(function() {
+                masonry(masonryMode);
+            });
+    } else {
+        $.post("API/postPost.php", { title: title,
+                                     content : content })
+            .done(function() {
+                masonry(masonryMode);
+            });
+    }
+
+
+}
+
 $(window).on("load", function() {
    $(".modal-close").click(function () {
        $(".modal").hide();
@@ -33,11 +55,15 @@ $(window).on("load", function() {
 });

 var masonryMode = 0;
+var windowWidth = $(window).width();

 $(window).resize(function() {
    clearTimeout(window.resizedFinished);
    window.resizeFinished = setTimeout(function() {
-        masonry(masonryMode);
+        if ($(window).width() != windowWidth) {
+            windowWidth = $(window).width();
+            masonry(masonryMode);
+        }
    }, 250);
 });

@@ -52,7 +78,7 @@ function masonry(mode) {
     * Initialise columns.
     */
    var columns = new Array(columnCount);
-    var $columns = new Array(columnCount);
+
    for (i = 0; i < columnCount; i++) {
        $column = $("<div class=\"column\">");
        $column.width(100/columnCount + "%");
@@ -60,19 +86,21 @@ function masonry(mode) {
        columns[i] = [0, $column];
    }

-    if(mode == 1) {
+    if(mode > 0) {
        $postInput = $("<div class=\"post platform\">");
-        $form = $("<form action=\"API/postPost.php\" method=\"post\">");
+        $form = $("<form class=\"newpost\" action=\"API/postPost.php\" method=\"post\" onsubmit=\"postPost(); return false;\">");
        $postInput.append($form);

-        $form.append($("<input class=\"newpost\" name=\"newpost-title\" placeholder=\"Titel\" type=\"text\">"));
-        $form.append($("<textarea class=\"newpost\" name=\"newpost-content\" placeholder=\"Schrijf een berichtje...\">"));
+        if(mode == 2) {
+            $form.append($("<input class=\"newpost\" type=\"hidden\" name=\"group\" value=\"" + groupID + "\">"));
+        }
+
+        $form.append($("<input class=\"newpost\" name=\"title\" placeholder=\"Titel\" type=\"text\">"));
+        $form.append($("<textarea class=\"newpost\" name=\"content\" placeholder=\"Schrijf een berichtje...\" maxlength='1000'></textarea><span></span>"));
        $form.append($("<input value=\"Plaats!\" type=\"submit\">"));
        columns[0][1].append($postInput);

-        $postInput.on("load", function() {
-            columns[0][0] = $postInput.height() + margin;
-        });
+        columns[0][0] = $postInput.height() + margin;
    }

    /*
@@ -92,18 +120,19 @@ function masonry(mode) {
    /*
     * Get the posts from the server.
     */
-    $.post("API/getPosts.php", { usr : userID })
+    $.post("API/getPosts.php", { usr : userID, grp : groupID })
           .done(function(data) {
               posts = JSON.parse(data);

               /*
                * Rearange the objects.
                */
-               jQuery.each(posts, function() {
+               $.each(posts, function() {
                   $post = $("<div class=\"post platform\" onclick=\"requestPost(\'"+this['postID']+"\')\">");
-                   $post.append($("<h2>").text(this["title"]));
-                   $post.append($("<p>").html(this["content"]));
+                   $post.append($("<h2>").html(this["title"]));
+                   $post.append($("<p>").html(fancyText(this["content"])));
                   $post.append($("<p class=\"subscript\">").text(this["nicetime"]));
+                   $post.append($("<p class=\"subscript\">").text("comments: " + this["comments"] + ", niet slechts: " + this["niet_slechts"]));

                   shortestColumn = getShortestColumn(columns);
                   shortestColumn[1].append($post);
--- a/website/public/js/post.js
+++ b/website/public/js/post.js
@@ -1,8 +1,14 @@
-function postComment() {
+function postComment(buttonValue) {
+    formData = $("#newcommentform").serializeArray();
+    formData.push({name: "button", value: buttonValue});
    $.post(
        "API/postComment.php",
-        $("#newcommentform").serialize()
-    );
+        formData
+    ).done(function (response) {
+        if (response == "frozen") {
+            alert("Je account is bevroren, dus je kan geen comments plaatsen of \"niet slechten\". Contacteer een admin als je denkt dat dit onjuist is.");
+        }
+    });

    $("#newcomment").val("");

@@ -11,8 +17,6 @@ function postComment() {
        "API/loadPost.php",
        $("#newcommentform").serialize()
    ).done(function (data) {
-        $('#modal-response').html(data);
+        $('#modal-response').html(fancyText(data));
    });
-}
-
-
+}
--- a/website/public/js/registerAndLogin.js
+++ b/website/public/js/registerAndLogin.js
@@ -1,5 +1,5 @@
 function checkLoggedIn() {
-    if (confirm("You are already logged in!\nDo you want to logout?\nPress ok to logout.") == true) {
+    if (confirm("U bent al ingelogd!!\nWilt u uitloggen?\nKlik ok om uit te loggen.") == true) {
        window.location.href = "logout.php";
    } else {
        window.location.href = "profile.php";
@@ -7,9 +7,9 @@ function checkLoggedIn() {
 }

 function bannedAlert(){
-    alert("Your account is banned");
+    alert("Uw account is geband!");
 }

 function emailNotConfirmed(){
-    alert("Your account has not been verified yet!\nAnother email has been sent to you")
+    alert("Uw account is nog niet bevestigd!\nEr is een nieuwe email gestuurd om uw account te bevestigen");
 }
--- a/website/public/js/search.js
+++ b/website/public/js/search.js
@@ -1,33 +1,41 @@
-function searchUsers(n, m) {
+$(window).on('load', function () {
+    pageNumber();
+});
+
+function searchUsers() {
    $.post(
        "API/searchUsers.php",
-        {
-            n: n,
-            m: m,
-            search: $("#search-input").val(),
-            filter: $("#search-filter").val()
-        }
+        $('#search-form').serialize()
    ).done(function(data) {
-        console.log(data);
        if (!showFriends(data, "#search-users-list", 0, "profile.php", "GET")) {
            $("#search-users-list").text("Niemand gevonden");
        }
    });
 }

-function searchGroups(n, m) {
+function searchGroups() {
    $.post(
        "API/searchGroups.php",
-        {
-            n: n,
-            m: m,
-            search: $("#search-input").val(),
-            filter: $("#search-filter").val()
-        }
+        $('#search-form').serialize()
    ).done(function(data) {
-        console.log(data);
        if (!showGroups(data, "#search-groups-list")) {
            $("#search-groups-list").text("Geen groepen gevonden");
        }
    });
+}
+
+function pageNumber() {
+    var input = input2 = $('#search-form').serialize();
+    $.post(
+        "API/searchPageNumber.php",
+        input + "&option=user"
+    ).done(function (data) {
+        $('#user-pageselect').html(data);
+    });
+    $.post(
+        "API/searchPageNumber.php",
+        input2 + "&option=group"
+    ).done(function (data) {
+        $('#group-pageselect').html(data);
+    });
 }
--- a/website/public/login.php
+++ b/website/public/login.php
@@ -19,16 +19,24 @@
            </script>";
    }

+    // define variables and set to empty values
+    $name = $surname = $bday = $username = $password = $confirmpassword = $location = $housenumber = $email = $confirmEmail = $captcha = $ip = "";
+    $genericErr = $nameErr = $surnameErr = $bdayErr = $usernameErr = $passwordErr = $confirmpasswordErr = $locationErr = $housenumberErr = $emailErr = $confirmEmailErr = $captchaErr = "";
+    $correct = true;
+    $day_date = "dag";
+    $month_date = "maand";
+    $year_date = "jaar";
+
    // Define variables and set to empty values
-    $uname = $psw ="";
+    $user = $psw = $remember ="";
    $loginErr = $resetErr ="";

    if ($_SERVER["REQUEST_METHOD"] == "POST") {
        switch ($_POST["submit"]) {
            case "login":
                try {
-                    $uname = ($_POST["uname"]);
-                    validateLogin($_POST["uname"], $_POST["psw"]);
+                    $user = ($_POST["user"]);
+                    validateLogin($_POST["user"], $_POST["psw"]);
                } catch(loginException $e) {
                    $loginErr = $e->getMessage();
                }
@@ -46,19 +54,10 @@
                          </script>";
                }
                break;
-
+            case "register":
+                include("register.php");
        }
    }
-//    // Trying to login
-//    if ($_SERVER["REQUEST_METHOD"] == "POST") {
-//        try{
-//            $uname = ($_POST["uname"]);
-//            validateLogin($_POST["uname"], $_POST["psw"]);
-//        } catch(loginException $e) {
-//            $loginErr = $e->getMessage();
-//        }
-//    }
-
 /* This view adds login view */
 include("../views/login-view.php");
 ?>
--- a/website/public/profile.php
+++ b/website/public/profile.php
@@ -8,14 +8,16 @@
    <style>
        @import url("styles/profile.css");
        @import url("styles/post-popup.css");
+        @import url('https://fonts.googleapis.com/css?family=Anton');
    </style>
 </head>
 <body>
 <?php
-include("../queries/user.php");
-include("../queries/friendship.php");
-include("../queries/nicetime.php");
-include("../queries/post.php");
+include_once("../queries/user.php");
+include_once("../queries/friendship.php");
+include_once("../queries/nicetime.php");
+include_once("../queries/post.php");
+include_once("../queries/calcAge.php");

 if(empty($_GET["username"])) {
    $userID = $_SESSION["userID"];
@@ -26,7 +28,6 @@ if(empty($_GET["username"])) {
 $user = selectUser($_SESSION["userID"], $userID);
 $profile_friends = selectAllFriends($userID);
 $profile_groups = selectAllUserGroups($userID);
-$posts = selectAllUserPosts($userID);


 if ($userID == $_SESSION["userID"]) {
@@ -53,23 +54,12 @@ include("../views/footer.php");
 <script src="js/friendButtons.js"></script>
 <script src="js/masonry.js"></script>
 <script>
-    var posts;
-
    $(document).ready(function() {
        userID = <?= $userID ?>;
+        groupID = 0;
        placeFriendButtons();

        masonry(<?= $masonry_mode ?>);
-//        alert("blap");
-//        $.post("API/getPosts.php", { usr : userID }, "json")
-//            .done(function(data) {
-//                posts = JSON.parse(data);
-//                alert(posts[0]["content"]);
-//            }).fail(function() {
-//                alert("failure...");
-//        });
-
-
    });
 </script>
 </body>
--- a/website/public/register(stash).php
+++ b/website/public/register(stash).php
@@ -0,0 +1,116 @@
+<!DOCTYPE html>
+<html>
+<?php
+    include("../views/login_head.php");
+    require_once("../queries/connect.php");
+    include_once("../queries/register.php");
+    include_once("../queries/checkInput.php");
+    include_once("../queries/emailconfirm.php");
+?>
+<body>
+<?php
+    session_start();
+
+    if(isset($_SESSION["userID"])){
+        header("location: login.php");
+    }
+    // define variables and set to empty values
+    $name = $surname = $bday = $username = $password = $confirmpassword = $location = $housenumber = $email = $confirmEmail = $captcha = $ip = "";
+    $genericErr = $nameErr = $surnameErr = $bdayErr = $usernameErr = $passwordErr = $confirmpasswordErr = $locationErr = $housenumberErr = $emailErr = $confirmEmailErr = $captchaErr = "";
+    $correct = true;
+    $day_date = "dag";
+    $month_date = "maand";
+    $year_date = "jaar";
+
+    // Trying to register an account
+    if ($_SERVER["REQUEST_METHOD"] == "POST") {
+        try {
+            $name = test_input(($_POST["name"]));
+            checkInputChoice($name, "lettersAndSpaces");
+        } catch(lettersAndSpacesException $e){
+            $correct = false;
+            $nameErr = $e->getMessage();
+        }
+
+        try {
+            $surname = test_input(($_POST["surname"]));
+            checkInputChoice($surname, "lettersAndSpaces");
+        }
+        catch(lettersAndSpacesException $e){
+            $correct = false;
+            $surnameErr = $e->getMessage();
+        }
+
+        try{
+            $day_date = test_input(($_POST["day_date"]));
+            $month_date = test_input(($_POST["month_date"]));
+            $year_date = test_input(($_POST["year_date"]));
+            $bday = $year_date . "-" . $month_date . "-" . $day_date;
+            checkInputChoice($bday, "bday");
+        } catch(bdayException $e){
+            $correct = false;
+            $bdayErr = $e->getMessage();
+        }
+
+        try{
+            $username = str_replace(' ', '', test_input(($_POST["username"])));
+            checkInputChoice($username, "username");
+        } catch(usernameException $e){
+            $correct = false;
+            $usernameErr = $e->getMessage();
+        }
+
+        try{
+            $password = str_replace(' ', '', test_input(($_POST["password"])));
+            checkInputChoice($password, "longerEight");
+            matchPassword();
+        } catch(passwordException $e){
+            $correct = false;
+            $passwordErr = $e->getMessage();
+        } catch(confirmPasswordException $e){
+            $correct = false;
+            $confirmPasswordErr = $e->getMessage();
+        }
+
+        try{
+            $location = test_input(($_POST["location"]));
+            checkInputChoice($location, "lettersAndSpaces");
+        } catch(lettersAndSpacesException $e){
+            $correct = false;
+            $locationErr = $e->getMessage();
+        }
+
+        try{
+            $email = test_input(($_POST["email"]));
+            checkInputChoice($email, "email");
+            $confirmEmail = test_input(($_POST["confirmEmail"]));
+            matchEmail();
+        } catch(emailException $e){
+            $correct = false;
+            $emailErr = $e->getMessage();
+        } catch(confirmEmailException $e){
+            $correct = false;
+            $confirmEmailErr = $e->getMessage();
+        }
+
+        try{
+            $captcha = $_POST['g-recaptcha-response'];
+            checkCaptcha($captcha);
+        } catch(captchaException $e){
+            $correct = false;
+            $captchaErr = $e->getMessage();
+        }
+
+        try {
+            getIp();
+            registerCheck($correct);
+            sendConfirmEmailUsername($username);
+        } catch(registerException $e){
+            $genericErr = $e->getMessage();
+        }
+    }
+/* This view adds register view */
+include("../views/register-view.php");
+?>
+</body>
+</html>
--- a/website/public/register.php
+++ b/website/public/register.php
@@ -1,104 +1,91 @@
-<!DOCTYPE html>
-<html>
 <?php
-    include("../views/login_head.php");
-    require_once("../queries/connect.php");
-    include_once("../queries/register.php");
-    include_once("../queries/checkInput.php");
-    include_once("../queries/emailconfirm.php");
-?>
-<body>
-<?php
-    session_start();
-    if(isset($_SESSION["userID"])){
-        header("location: login.php");
+
+    try {
+        $name = test_input(($_POST["name"]));
+        checkInputChoice($name, "lettersAndSpaces");
+    } catch(lettersAndSpacesException $e){
+        $correct = false;
+        $nameErr = $e->getMessage();
    }
-    // define variables and set to empty values
-    $name = $surname = $bday = $username = $password = $confirmpassword = $location = $housenumber = $email = $captcha = $ip = "";
-    $genericErr = $nameErr = $surnameErr = $bdayErr = $usernameErr = $passwordErr = $confirmpasswordErr = $locationErr = $housenumberErr = $emailErr = $captchaErr = "";
-    $correct = true;

-    // Trying to register an account
-    if ($_SERVER["REQUEST_METHOD"] == "POST") {
-        try {
-            $name = test_input(($_POST["name"]));
-            checkInputChoice($name, "lettersAndSpaces");
-        } catch(lettersAndSpacesException $e){
-            $correct = false;
-            $nameErr = $e->getMessage();
-        }
-
-        try {
-            $surname = test_input(($_POST["surname"]));
-            checkInputChoice($surname, "lettersAndSpaces");
-        }
-        catch(lettersAndSpacesException $e){
-            $correct = false;
-            $surnameErr = $e->getMessage();
-        }
-
-        try{
-            $bday = test_input(($_POST["bday"]));
-            checkInputChoice($bday, "bday");
-        } catch(bdayException $e){
-            $correct = false;
-            $bdayErr = $e->getMessage();
-        }
-
-        try{
-            $username = str_replace(' ', '', test_input(($_POST["username"])));
-            checkInputChoice($username, "username");
-        } catch(usernameException $e){
-            $correct = false;
-            $usernameErr = $e->getMessage();
-        }
-
-        try{
-            $password = str_replace(' ', '', test_input(($_POST["password"])));
-            checkInputChoice($password, "longerEight");
-            matchPassword();
-        } catch(passwordException $e){
-            $correct = false;
-            $passwordErr = $e->getMessage();
-        } catch(confirmPasswordException $e){
-            $correct = false;
-            $confirmPasswordErr = $e->getMessage();
-        }
-
-        try{
-            $location = test_input(($_POST["location"]));
-            checkInputChoice($location, "lettersAndSpaces");
-        } catch(lettersAndSpacesException $e){
-            $correct = false;
-            $locationErr = $e->getMessage();
-        }
-
-        try{
-            $email = test_input(($_POST["email"]));
-            checkInputChoice($email, "email");
-        } catch(emailException $e){
-            $correct = false;
-            $emailErr = $e->getMessage();
-        }
-
-        try{
-            $captcha = $_POST['g-recaptcha-response'];
-            checkCaptcha($captcha);
-        } catch(captchaException $e){
-            $correct = false;
-            $captchaErr = $e->getMessage();
-        }
-
-        try {
-            getIp();
-            registerCheck($correct);
-            sendConfirmEmailUsername($username);
-        } catch(registerException $e){
-            $genericErr = $e->getMessage();
-        }
+    try {
+        $surname = test_input(($_POST["surname"]));
+        checkInputChoice($surname, "lettersAndSpaces");
+    }
+    catch(lettersAndSpacesException $e){
+        $correct = false;
+        $surnameErr = $e->getMessage();
+    }
+
+    try{
+        $day_date = test_input(($_POST["day_date"]));
+        $month_date = test_input(($_POST["month_date"]));
+        $year_date = test_input(($_POST["year_date"]));
+        $bday = $year_date . "-" . $month_date . "-" . $day_date;
+        checkInputChoice($bday, "bday");
+    } catch(bdayException $e){
+        $correct = false;
+        $bdayErr = $e->getMessage();
+    }
+
+    try{
+        $username = str_replace(' ', '', test_input(($_POST["username"])));
+        checkInputChoice($username, "username");
+    } catch(usernameException $e){
+        $correct = false;
+        $usernameErr = $e->getMessage();
+    }
+
+    try{
+        $password = str_replace(' ', '', test_input(($_POST["password"])));
+        checkInputChoice($password, "longerEight");
+        matchPassword();
+    } catch(passwordException $e){
+        $correct = false;
+        $passwordErr = $e->getMessage();
+    } catch(confirmPasswordException $e){
+        $correct = false;
+        $confirmPasswordErr = $e->getMessage();
+    }
+
+    try{
+        $location = test_input(($_POST["location"]));
+        checkInputChoice($location, "lettersAndSpaces");
+    } catch(lettersAndSpacesException $e){
+        $correct = false;
+        $locationErr = $e->getMessage();
+    }
+
+    try{
+        $email = test_input(($_POST["email"]));
+        checkInputChoice($email, "email");
+        $confirmEmail = test_input(($_POST["confirmEmail"]));
+        matchEmail();
+    } catch(emailException $e){
+        $correct = false;
+        $emailErr = $e->getMessage();
+    } catch(confirmEmailException $e){
+        $correct = false;
+        $confirmEmailErr = $e->getMessage();
+    }
+
+    try{
+        $captcha = $_POST['g-recaptcha-response'];
+        checkCaptcha($captcha);
+    } catch(captchaException $e){
+        $correct = false;
+        $captchaErr = $e->getMessage();
+    }
+
+    try {
+        getIp();
+        registerCheck($correct);
+        sendConfirmEmailUsername($username);
+    } catch(registerException $e){
+        echo "<script>
+                            window.onload = function() {
+                              $('#registerModal').show();
+                            }
+                          </script>";
+        $genericErr = $e->getMessage();
    }
-/* This view adds register view */
-include("../views/register-view.php");
-?>
-</body>
-</html>
--- a/website/public/resetpassword.php
+++ b/website/public/resetpassword.php
@@ -28,7 +28,7 @@ if ($_SERVER["REQUEST_METHOD"] == "GET") {
 }

 function changePassword() {
-    $stmt = $GLOBALS["db"]->prepare("
+    $stmt = prepareQuery("
        UPDATE
            `user`
        SET
@@ -42,7 +42,7 @@ function changePassword() {
 }

 function verifyLink(int $userID, string $hash) {
-    $stmt = $GLOBALS["db"]->prepare("
+    $stmt = prepareQuery("
        SELECT
            `password`
        FROM 
--- a/website/public/styles/adminbutton.css
+++ b/website/public/styles/adminbutton.css
@@ -0,0 +1,3 @@
+#quick-links i {
+    font-size: 32px;
+}
--- a/website/public/styles/adminpanel.css
+++ b/website/public/styles/adminpanel.css
@@ -4,7 +4,7 @@

 .admin-panel input[type="radio"], input[type="checkbox"] {
    vertical-align: middle;
-    height: auto;
+    height: 28px;
    margin: 2px;
 }

@@ -34,7 +34,6 @@
    width: 100%;
 }

-.usertable .table-checkbox {width: 20px}
 .usertable .table-username {width: 150px}
 .usertable .table-status {width: 100px}
 .usertable .table-action {width: 200px}
@@ -44,10 +43,18 @@
    padding: 3px;
 }

-.usertable tr {
+.usertable th, tr {
    text-align: left;
 }

 .usertable tr:hover {
    background-color: #f5f5f5;
 }
+
+.bancommentedit {
+    display: none;
+}
+
+.bancommentform input[type="text"] {
+    width: 100%;
+}
--- a/website/public/styles/chat.css
+++ b/website/public/styles/chat.css
@@ -1,3 +1,8 @@
+
+body {
+    overflow: hidden;
+}
+
 /* Overall chat-screen */
 .chat {
    position: fixed;
@@ -37,6 +42,22 @@
 }

 /* Chat-message takes the whole width of the chat area */
+.day-message {
+    width: 100%;
+    min-height: 40px;
+    padding: 10px 0;
+    clear: both;
+    text-align: center;
+}
+
+.day-message-content {
+    width: auto;
+    padding: 10px;
+
+    background-color: #F8F8F8;
+    color: #666;
+}
+
 .chat-message {
    width: 100%;
    min-height: 40px;
@@ -105,4 +126,40 @@
 .active-friend-chat {
    background: #4CAF50;
    color: white;
+}
+
+.chat-message img {
+    max-width: 100%;
+}
+
+.chat-message a {
+    text-decoration: underline;
+}
+
+.chat-time {
+    color: #666666;
+    font-size: 12px;
+    margin-bottom: -3px;
+}
+
+.chat-message-other .chat-time {
+    text-align: right;
+}
+
+@media only screen and (max-width: 1080px) {
+    .chat-message-self, .chat-message-other {
+        max-width: 75%;
+    }
+    .chat {
+        left: 0;
+        width: 100%;
+    }
+    #chat-recent-panel {
+        left: 0;
+        width: 320px;
+    }
+    #chat-history {
+        left: 50%;
+        width: calc(100% - 390px);
+    }
 }
--- a/website/public/styles/header.css
+++ b/website/public/styles/header.css
@@ -26,7 +26,8 @@ header {
 }

 #header-search {
-    padding-left: 42px;
+    margin: 24px 0 24px 32px;
+    vertical-align: middle;
 }


@@ -48,5 +49,11 @@ header div {
 }

 #open-notifications {
-    padding: 5px 20px 5px 0px;
+    padding: 20px 20px 20px 0px;
+}
+
+@media only screen and (max-width: 1080px) {
+    #header-logo {
+        display: none;
+    }
 }
--- a/website/public/styles/index.css
+++ b/website/public/styles/index.css
@@ -30,8 +30,10 @@ form {
    border-radius: 12px;
    height: 85%;
    margin: auto;
-    width: 80%;
-    overflow-y:auto;
+    width: 600px;
+    overflow-y: auto;
+    overflow-x: hidden;
+
 }


@@ -44,13 +46,13 @@ h1 {

 /* registreer titel*/
 h2 {
-    padding: 16px;
+    padding: 8px;
    text-align: left;
    font-size: 2.0em;
 }

 h3 {
-    padding: 16px;
+    padding: 8px;
    text-align: center;
    font-size: 1.5em;
 }
@@ -61,11 +63,15 @@ input[type=text], input[type=password], input[type=email], input[type="date"] {
    display: inline-block;
    height: 60%;
    font-size: 16px;
-    padding: 8px 20px;
+    padding: 8px 10px;
    margin: 4px 0;
    width: 55%;
 }

+.middle{
+    text-align: center;
+}
+
 .center{
    text-align: center;
 }
@@ -77,7 +83,7 @@ button {
    cursor: pointer;
    height: 50%;
    padding: 8px 20px;
-    margin: 10px;
+    margin: 5px;
    font-family: Arial;
    font-size: 22px;
    box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24);
@@ -88,6 +94,7 @@ button {
    font-family: Arial;
    font-size: 15px;
    color: red;
+    text-align: left;
 }

 label {
@@ -96,19 +103,19 @@ label {

 /* padding voor registreer container */
 .login_containerregister {
-    padding: 16px;
+    padding: 8px;
    text-align: left;
 }

 /* padding voor login_containers */
 .login_containerlogin {
-    padding:16px;
+    padding:8px;
    text-align: center;
 }

 /* padding voor foutmelding login */
 .login_containerfault {
-    padding: 16px;
+    padding: 4px;
    text-align: center;
    color: red;
 }
@@ -127,10 +134,14 @@ label {
    background-attachment: fixed;*/
    box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24);
    height: 400px;
-    margin: 34px auto;
+    margin: 16px auto;
    overflow-y: auto;
    padding: 20px;
-    width: 45%;
+    width: 600px;
+}
+
+select{
+    width: 18%;
 }

 ul {
@@ -143,12 +154,12 @@ ul {
    display: none; /* Hidden by default */
    position: fixed; /* Stay in place */
    z-index: 1; /* Sit on top */
-    padding-top: 100px; /* Location of the box */
+    padding-top: 30px; /* Location of the box */
    left: 0;
    top: 0;
    width: 100%; /* Full width */
    height: 100%; /* Full height */
-    overflow: auto; /* Enable scroll if needed */
+    overflow: hidden; /* Enable scroll if needed */
    background-color: rgb(0,0,0); /* Fallback color */
    background-color: rgba(0,0,0,0.4); /* Black w/ opacity */
 }
@@ -160,7 +171,7 @@ ul {
    margin: auto;
    padding: 0;
    border: 1px solid #888;
-    width: 500px;
+    width: 600px;
    box-shadow: 0 4px 8px 0 rgba(0,0,0,0.2),0 6px 20px 0 rgba(0,0,0,0.19);
    -webkit-animation-name: animatetop;
    -webkit-animation-duration: 0.4s;
@@ -183,7 +194,7 @@ ul {
 .close {
    color: white;
    float: right;
-    font-size: 28px;
+    font-size: 36px;
    font-weight: bold;
 }

@@ -195,15 +206,16 @@ ul {
 }

 .modal-header {
-    padding: 2px 16px;
+    padding: 4px 16px;
    background-color: #FBC02D;
    color: black;
 }

-.modal-body {padding: 2px 16px;}
+.modal-body {
+    padding: 2px 16px;
+}

 .modal-footer {
-    padding: 2px 16px;
    background-color: #FBC02D;
    color: black;
-}
+}
--- a/website/public/styles/main.css
+++ b/website/public/styles/main.css
@@ -92,21 +92,29 @@ p {
    border-radius: 50%;
 }

+.online {
+    border: #4CAF50 solid 3px;
+}
+
+.offline {
+    border: #666666 solid 3px;
+}
+
 .group-picture {
    border-radius: 5px;
 }

 .item-box, .item-box-full-width {
-    margin: 20px 0 0 0;
    padding: 25px;
    background-color: #FFFFFF;
 }

 .item-box {
-    width: calc(50% - 60px);
+    width: calc(33% - 50px);
+    display: inline-table;
 }

-@media only screen and (max-width: 900px) {
+@media only screen and (max-width: 1400px) {
    .item-box {
        width: calc(100% - 50px);
    }
@@ -183,6 +191,10 @@ button.green {
    background-color: forestgreen;
 }

+button.gray{
+    background-color: #FFF;
+    color: #333;
+}

 button,
 input[type="submit"],
@@ -224,6 +236,7 @@ td {

 /* Custom title box, appears instantaneously */
 a[data-title]:hover,
+i[data-title]:hover,
 img[data-title]:hover,
 span[data-title]:hover,
 div[data-title]:hover {
@@ -231,6 +244,7 @@ div[data-title]:hover {
 }

 a[data-title]:hover:after,
+i[data-title]:hover:after,
 img[data-title]:hover:after,
 span[data-title]:hover:after,
 div[data-title]:hover:after {
@@ -275,3 +289,34 @@ div[data-title]:hover:after {
    display: inline-block;
    vertical-align: middle;
 }
+
+::-webkit-scrollbar {
+    width: 5px;
+    height: 5px;
+}
+::-webkit-scrollbar-track {
+    background: none;
+}
+::-webkit-scrollbar-thumb {
+    -webkit-border-radius: 20px;
+    border-radius: 20px;
+    background: #4CAF50;
+}
+
+@media only screen and (max-width: 1080px) {
+    body {
+        font-size: 28px!important;
+    }
+    button, input, select {
+        font-size: 28px;
+        height: 42px;
+    }
+    textarea {
+        font-size: 28px;
+    }
+    input[type="checkbox"], input[type="radio"] {
+        width: 28px;
+        height: 28px;
+    }
+
+}
--- a/website/public/styles/menu.css
+++ b/website/public/styles/menu.css
@@ -5,7 +5,7 @@

    left: 0;
    top: 80px;
-    height: calc(100% - 80px);
+    height: calc(100% - 120px);
    width: 236px;

    padding: 20px 10px;
@@ -86,4 +86,18 @@
    height: 100%;
    padding: 0;
    text-align: left;
+}
+
+@media only screen and (max-width: 1080px) {
+    #contact-menu, #notification-center {
+        display: none;
+        background: rgba(0, 0, 0, 0.4);
+        width: calc(50% - 20px);
+    }
+    .content {
+        margin-left: 0;
+    }
+    #quick-links i {
+        font-size: 48px!important;
+    }
 }
--- a/website/public/styles/resetpassword.css
+++ b/website/public/styles/resetpassword.css
@@ -1,6 +1,9 @@
+body {
+    background-color: #FBC02D;
+}
+
 .password-change {
    height: 100%;
-    background-color: #FBC02D;
    margin: auto;
 }

@@ -12,6 +15,14 @@
    margin: 30px auto auto;
    display: block;
 }
-.password-change img {
+.top-logo img {
    width: 50%;
 }
+
+.error-page {
+    text-align: center;
+}
+
+.error-page img {
+    vertical-align: middle;
+}
--- a/website/public/styles/mobilefriendly.css
+++ b/website/public/styles/mobilefriendly.css
@@ -0,0 +1,47 @@
+/* MAIN */
+body {
+    font-size: 28px!important;
+}
+button {
+    font-size: 28px;
+}
+
+/* HEADER */
+#header-logo {
+    display: none;
+}
+
+/* PROFILE */
+.post-box {
+    width: calc(100% - 65px);
+}
+
+/* MENU */
+#contact-menu, #notification-center {
+    display: none;
+    background: rgba(0, 0, 0, 0.4);
+    width: calc(50% - 20px);
+}
+.content {
+    margin-left: 0;
+}
+#quick-links i {
+    font-size: 48px!important;
+}
+
+/* CHAT */
+.chat-message-self, .chat-message-other {
+    max-width: 75%;
+}
+.chat {
+    left: 0;
+    width: 100%;
+}
+#chat-recent-panel {
+    left: 0;
+    width: 320px;
+}
+#chat-history {
+    left: 50%;
+    width: calc(100% - 390px);
+}
--- a/website/public/styles/post-popup.css
+++ b/website/public/styles/post-popup.css
@@ -69,4 +69,18 @@
 .commentcontent {
    margin: 5px auto;
    width: 95%;
+}
+
+.nietslecht-text {
+    font-family: Impact, Anton, sans-serif;
+    text-shadow: -1px 0 1px black, 0 1px 1px black, 1px 0 1px black, 0 -1px 1px black;
+}
+
+.nietslecht {
+}
+
+.nietslecht img {
+    vertical-align: middle;
+    height: 24px;
+    width: 24px;
 }
--- a/website/public/styles/profile.css
+++ b/website/public/styles/profile.css
@@ -1,15 +1,60 @@
-.profile-box {
-    min-height: 150px;
-    padding: 25px;
-    background-color: #FFFFFF;
+/* New */
+
+.user-box {
+    text-align: center;
 }

-.profile-box .profile-picture, .profile-box .group-picture {
+.status-buttons-container {
+    position: relative;
+    float: left;
+    width: 200px;
+    display: inline-block;
+}
+
+.friend-button-container {
+    position: relative;
+    float: right;
+    width: 200px;
+    display: inline-block;
+}
+
+.friend-button-container button, .status-buttons-container button {
+    display: block;
+
+    margin: 7px 0;
+    width: 200px;
+
+    font-size: 18px;
+}
+
+.empty-button {
+    background: none;
+    cursor: auto;
+}
+.empty-button:active {
+    box-shadow: none;
+}
+
+.profile-info {
+    display: inline-block;
+
+    min-width: 250px;
+    width: auto;
+    padding-top: 30px;
+}
+
+.main-picture {
+    position: relative;
+    border-width: 5px;
+
+    display: inline-block;
    width: 150px;
    height: 150px;
-    margin: 0 20px 20px 0;
+    margin-bottom: -45px;
 }

+/* Old */
+
 .profile-box h1.profile-username {
    padding-top: 50px;
 }
@@ -18,18 +63,17 @@
 }

 div.posts {
-    padding-top: 20px;
    width: calc(100% + 20px);
    display: inline-flex;
 }

 div.posts div.post {
    display: block;
-    margin: 20px 0 0 0;
    padding: 10px;
    width: calc(100% - 40px);
    cursor: pointer;
    transition-duration: 250ms;
+    word-wrap: break-word;
 }

 div.posts div.post:hover {
@@ -59,6 +103,12 @@ div.posts .post form textarea.newpost {
    height: 100px;
 }

+.post .post-date {
+    float: right;
+    color: #aaaaaa;
+    font-size: 0.8em;
+}
+
@media only screen and (max-width: 1500px) {
    .post-box {
        width: calc(50% - 68px);
@@ -66,28 +116,12 @@ div.posts .post form textarea.newpost {
 }

 /* mobile */
-@media only screen and (max-width: 1000px) {
+@media only screen and (max-width: 1080px) {
    .post-box {
        width: calc(100% - 65px);
    }
+    .modal {
+        left: 0!important;
+        width: 100%!important;
+    }
 }
-
-.post .post-date {
-    float: right;
-    color: #aaaaaa;
-    font-size: 0.8em;
-}
-
-button.friend-button {
-    float: right;
-    height: auto;
-    padding: 10px;
-    margin-left: 10px;
-    border-radius: 5px;
-    transition-duration: 250ms;
-    cursor: pointer;
-}
-
-button.friend-button:hover {
-    box-shadow: 0 10px 20px rgba(0,0,0,0.19), 0 6px 6px rgba(0,0,0,0.23);
-}