2017-01-20 14:41:14 +01:00
37 changed files with 812 additions and 652 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -8,7 +8,7 @@
 # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839


-
+.idea/*
 # User-specific stuff:
 .idea/workspace.xml
 .idea/tasks.xml
--- a/website/.htaccess
+++ b/website/.htaccess
@@ -0,0 +1,14 @@
+Options +FollowSymLinks
+RewriteEngine On
+
+ErrorDocument 404 /error404.jpg
+
+RewriteCond %{SCRIPT_FILENAME} !-d
+RewriteCond %{SCRIPT_FILENAME} !-f
+
+# Resolve .php file for extensionless php urls
+RewriteRule ^([^/.]+)$ $1.php [L]
+
+RewriteRule ^([^/.]+)\/$ $1.php [L]
+
+RewriteRule ^profile/([A-z0-9]+)\/?$ profile.php?username=$1 [NC]
--- a/website/mysql_config.xml
+++ b/website/mysql_config.xml
@@ -1,7 +0,0 @@
-<?xml version='1.0'?>
-<MySQL_INIT>
-    <mysql_host>localhost</mysql_host>
-    <mysql_database>myhyvesbookplus</mysql_database>
-    <mysql_username>mhbp</mysql_username>
-    <mysql_password>qdtboXhCHJyL2szC</mysql_password>
-</MySQL_INIT>
--- a/website/public/API/loadMessages.php
+++ b/website/public/API/loadMessages.php
@@ -0,0 +1,13 @@
+<?php
+
+session_start();
+require_once("../../queries/connect.php");
+require_once("../../queries/private_message.php");
+
+if (isset($_POST["lastID"]) && $_POST["lastID"] != "") {
+
+    echo getNewChatMessages($_POST["lastID"], $_POST["destination"]);
+
+} else {
+    echo getOldChatMessages($_POST["destination"]);
+}
--- a/website/public/API/sendMessage.php
+++ b/website/public/API/sendMessage.php
@@ -1,6 +1,8 @@
 <?php

-include_once("../queries/private_message.php");
+session_start();
+require_once("../../queries/connect.php");
+require_once("../../queries/private_message.php");

 if (isset($_POST["destination"]) &&
    isset($_POST["content"])) {
--- a/website/public/img/error404.jpg
+++ b/website/public/img/error404.jpg
--- a/website/public/js/chat.js
+++ b/website/public/js/chat.js
@@ -1,10 +1,12 @@
 $(document).ready(function() {
    loadMessages();
+    sayEmpty();
+    $(".chat-field").hide();
 });

 function loadMessages() {
    $.post(
-        "loadMessages.php",
+        "API/loadMessages.php",
        $("#lastIDForm").serialize()
    ).done(function(data) {
        if (data && data != "[]") {
@@ -23,7 +25,7 @@ function loadMessages() {
 function sendMessage() {
    console.log($("#sendMessageForm").serialize());
    $.post(
-        "sendMessage.php",
+        "API/sendMessage.php",
        $("#sendMessageForm").serialize()
    ).done(function( data ) {
        console.log(data);
@@ -51,7 +53,14 @@ function addMessages(messages) {
 }

 function switchUser(userID) {
+    $(".chat-field").show();
    $(".destinationID").val(userID);
    $("#chat-history").html("");
    $("#lastID").val("");
+    $(".chat-left .friend-item").removeClass("active-friend-chat");
+    $(".chat-left #friend-item-" + userID).addClass("active-friend-chat");
+}
+
+function sayEmpty() {
+    $("#chat-history").html("Begin nu met chatten!");
 }
--- a/website/public/js/menu.js
+++ b/website/public/js/menu.js
@@ -6,7 +6,7 @@ $(document).ready(function() {
    $("#more-friends-click").click(function() {
        // Show only friends
        $("#groups-menu-section").slideUp();
-        $("#friends-menu-section a").show();
+        $("#friends-menu-section li").show();

        // Change buttons
        $("#more-friends-click").hide();
@@ -17,7 +17,7 @@ $(document).ready(function() {
    $("#more-groups-click").click(function() {
        // Show only groups
        $("#friends-menu-section").slideUp();
-        $("#groups-menu-section a").show();
+        $("#groups-menu-section li").show();

        // Change buttons
        $("#more-groups-click").hide();
--- a/website/public/login.php
+++ b/website/public/login.php
@@ -2,32 +2,39 @@
 <html>
 <?php
    include("../views/login_head.php");
-    include_once("../queries/connect.php");
+    require_once("../queries/connect.php");
    include_once("../queries/login.php");
+    include_once("../queries/checkInput.php")
 ?>
 <body>
 <?php
    session_start();

+    if(isset($_SESSION["userID"])){
+      echo "<script>
+                window.onload=checkLoggedIn();
+            </script>";
+    }
+
    // Define variables and set to empty values
    $uname = $psw ="";
    $loginErr ="";

    // Trying to login
    if ($_SERVER["REQUEST_METHOD"] == "POST") {
-        $uname=strtolower($_POST["uname"]);
        // Empty username or password field
        if (empty($_POST["uname"]) || empty($_POST["psw"])) {
            $loginErr = "Gebruikersnaam of wachtwoord is niet ingevuld";

        }
        else {
-            $psw=$_POST["psw"];
-            $hash=hashPassword()["password"];
-            $userid=hashPassword()["userID"];
+            $uname = strtolower(test_input($_POST["uname"]));
+            $psw = test_input($_POST["psw"]);
+            $hash = getUser()["password"];
+            $userid = getUser()["userID"];

            // If there's an account, go to the profile page
-            if(password_verify($psw.$uname, $hash)) {
+            if(password_verify($psw, $hash)) {
               $_SESSION["userID"] = $userid;
               header("location: profile.php");

@@ -41,5 +48,18 @@
 /* This view adds login view */
 include("../views/login-view.php");
 ?>
+
+<script>
+function checkLoggedIn() {
+    if (confirm("You are already logged in!\Do you want to logout?\Press ok to logout.") == true) {
+        unset($_SESSION["userID"]);
+        header("Location: login.php");
+    } else {
+        header("location: profile.php");
+    }
+    document.getElementById("demo").innerHTML = x;
+}
+</script>
+
 </body>
 </html>
--- a/website/public/logout.php
+++ b/website/public/logout.php
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html>
+<?php
+    include("../views/login_head.php");
+    require_once("../queries/connect.php");
+    include_once("../queries/login.php");
+?>
+<body>
+<?php
+    session_start();
+    unset($_SESSION["userID"]);
+    header("Location: login.php");
+?>
+</body>
+</html>
--- a/website/public/profile.php
+++ b/website/public/profile.php
@@ -1,3 +1,60 @@
+<?php
+include("../queries/user.php");
+include("../queries/friendship.php");
+
+function nicetime($date) {
+    if(empty($date)) {
+        return "No date provided";
+    }
+
+    $single_periods = array("seconde", "minuut", "uur", "dag", "week", "maand", "jaar", "decennium");
+    $multiple_periods = array("seconden", "minuten", "uur", "dagen", "weken", "maanden", "jaar", "decennia");
+    $lengths = array("60", "60", "24", "7", "4.35", "12", "10", "0");
+
+    $now = time();
+    $unix_date = strtotime($date);
+
+    if(empty($unix_date)) {
+        return "Bad date";
+    }
+
+    if($now > $unix_date) {
+        $difference = $now - $unix_date;
+        $tense = "geleden";
+    } else {
+        $difference = $unix_date - $now;
+        $tense = "vanaf nu";
+    }
+
+    for($i = 0; $difference >= $lengths[$i] && $i < count($lengths) - 1; $i++) {
+        $difference /= $lengths[$i];
+    }
+
+    $difference = round($difference);
+
+    if($difference != 1) {
+        $period = $multiple_periods[$i];
+    } else {
+        $period = $single_periods[$i];
+    }
+
+    return "$difference $period $tense";
+}
+
+if(empty($_GET["username"])) {
+    echo "User does not exist!";
+    return;
+}
+
+$userID = getUserID($_GET["username"]);
+
+$user = selectUser($userID);
+$profile_friends = selectAllFriends($userID);
+$profile_groups = selectAllUserGroups($userID);
+$posts = selectAllUserPosts($userID);
+
+?>
+
 <!DOCTYPE html>
 <html>
 <head>
--- a/website/public/register.php
+++ b/website/public/register.php
@@ -2,9 +2,9 @@
 <html>
 <?php
    include("../views/login_head.php");
-    include_once("../queries/connect.php");
+    require_once("../queries/connect.php");
    include_once("../queries/register.php");
-
+    include_once("../queries/checkInput.php");
 ?>
 <body>
 <?php
@@ -15,149 +15,27 @@
    $genericErr = $nameErr = $surnameErr = $bdayErr = $usernameErr = $passwordErr = $confirmpasswordErr = $locationErr = $housenumberErr = $emailErr = "";
    $correct = true;

-    // Saves information of filling in the form
-    if (isset($_POST["name"])) {
-        $name = $_POST["name"];
-    }
-
-    if (isset($_POST["surname"])) {
-        $surname = $_POST["surname"];
-    }
-
-    if (isset($_POST["bday"])) {
-        $bday = $_POST["bday"];
-    }
-
-    if (isset($_POST["username"])) {
-        $username = $_POST["username"];
-    }
-
-    if (isset($_POST["password"])) {
-        $password = $_POST["password"];
-    }
-
-    if (isset($_POST["location"])) {
-        $location = $_POST["location"];
-    }
-
-    if (isset($_POST["housenumber"])) {
-        $housenumber = $_POST["housenumber"];
-    }
-
-    if (isset($_POST["email"])) {
-        $email = $_POST["email"];
-    }
-
    // Trying to register an account
    if ($_SERVER["REQUEST_METHOD"] == "POST") {
-        if (empty($_POST["name"])) {
-            $nameErr = "Naam is verplicht!";
-            $correct = false;
+        checkInputChoice("name", "lettersAndSpace");
+        checkInputChoice("surname", "lettersAndSpace");

-        } else {
-            if (!preg_match("/^[a-zA-Z ]*$/",$name)) {
-                $nameErr = "Alleen letters en spaties zijn toegestaan!";
-                $correct = false;
-
-            }
-        }
-
-        if (empty($_POST["surname"])) {
-            $surnameErr = "Achternaam is verplicht!";
-            $correct = false;
-
-        } else {
-            if (!preg_match("/^[a-zA-Z ]*$/",$surname)) {
-                $surnameErr = "Alleen letters en spaties zijn toegestaan!";
-                $correct = false;
-
-            }
-        }
        if (empty($_POST["bday"])) {
            $bdayErr = "Geboortedatum is verplicht!";
            $correct = false;

-        }
-
-        if (empty($_POST["username"])) {
-            $usernameErr = "Gebruikersnaam is verplicht!";
-            $correct = false;
-
        } else {
-            if (strlen($username) < 6) {
-                $usernameErr = "Gebruikersnaam moet minstens 6 karakters bevatten";
-                $correct = false;
-
-            } else if (getExistingUsername() == 1){
-                $usernameErr = "Gebruikersnaam bestaat al";
-                $correct = false; 
-
-            }
+          $bday = test_input($_POST["bday"]);
        }

-        if (empty($_POST["password"])) {
-            $passwordErr = "Wachtwoord is verplicht!";
-            $correct = false;
-
-        } else {
-            if (strlen($password) < 8) {
-                $passwordErr = "Wachtwoord moet minstens 8 karakters bevatten";
-                $correct = false;
-
-            }
-        }
-
-        if (empty($_POST["confirmpassword"])) {
-            $confirmpasswordErr = "Herhaal wachtwoord!";
-            $correct = false;
-
-        }
-
-        if ($_POST["password"] != $_POST["confirmpassword"]) {
-            $confirmpasswordErr = "Wachtwoorden matchen niet";
-            $correct = false;
-
-        }
-
-        if (empty($_POST["location"])) {
-            $locationErr = "Straatnaam is verplicht!";
-            $correct = false;
-
-        } else {
-            if (!preg_match("/^[a-zA-Z ]*$/",$location)) {
-                $locationErr = "Alleen letters en spaties zijn toegestaan!";
-                $correct = false;
-
-            }
-        }
-
-        if (empty($_POST["email"])) {
-            $emailErr = "Email is verplicht!";
-            $correct = false;
-
-        } else {
-            if (!filter_var($email, FILTER_VALIDATE_EMAIL)) {
-                $emailErr = "Geldige email invullen!";
-                $correct = false;
-
-            } else if (getExistingEmail() == 1){
-                $emailErr = "Email bestaat al";
-                $correct = false;
-
-            }
-        }
-
-        // Checks if everything is filled in correctly
-        if ($correct == false){
-            $genericErr = "Bepaalde velden zijn verkeerd of niet ingevuld!";
-
-        } else {
-            registerAccount();
-            header("location: login.php");
-
-        }
+        checkInputChoice("username", "username");
+        checkInputChoice("password", "longerEight");
+        checkInputChoice("confirmpassword", "");
+        matchPassword();
+        checkInputChoice("location", "lettersAndSpace");
+        checkInputChoice("email", "email");
+        registerCheck();
    }
-
 /* This view adds register view */
 include("../views/register-view.php");
 ?>
--- a/website/public/settings.php
+++ b/website/public/settings.php
@@ -14,6 +14,7 @@
 <?php

 include("../views/main.php");
+$notImplemented = new settingsMessage("angry", "Deze functie werkt nog niet :(");

 if ($_SERVER["REQUEST_METHOD"] == "POST") {
    switch ($_POST["form"]) {
@@ -24,16 +25,10 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
            $result = updatePassword();
            break;
        case "email":
-            $result = array (
-                "type" => "settings-message-angry",
-                "message" => "Deze functie werkt nog niet :("
-            );
+            $result = changeEmail();
            break;
        case "picture":
-            $result = array (
-                "type" => "settings-message-angry",
-                "message" => "Deze functie werkt nog niet :("
-            );
+            $result = $notImplemented;
            break;
    }
 }
--- a/website/public/styles/chat.css
+++ b/website/public/styles/chat.css
@@ -88,4 +88,9 @@
    padding: 5px 10px;
    border-radius: 0 10px 10px 0;
    box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24);
+}
+
+.active-friend-chat {
+    background: aquamarine;
+    color: #333;
 }
--- a/website/public/styles/index.css
+++ b/website/public/styles/index.css
@@ -1,22 +1,6 @@
-::selection {
-    background: #845663;
-    color: white;
-}
-
-::-moz-selection {
-    background: #845663;
-    color: white;
-}
-
-a, a:link, a:visited, a:hover, a:active {
-    color: inherit;
-    text-decoration: none;
-}
-
 a.button {
-    background-color: #845663;
-    border: 2px solid black;
-    border-radius: 12px;
+    background-color: #405550;
+    border-radius: 10px;
    color: white;
    cursor: pointer;
    height: 50%;
@@ -27,64 +11,19 @@ a.button {
    font-size: 16px;
 }

-a[data-title]:hover:after, img[data-title]:hover:after, span[data-title]:hover:after,
-div[data-title]:hover:after{
-    content: attr(data-title);
-    padding: 4px 4px;
-    color: #FFFFFF;
-    position: absolute;
-    left: 0;
-    top: 100%;
-    z-index: 20;
-    white-space: nowrap;
-    -moz-border-radius: 5px;
-    -webkit-border-radius: 5px;
-    border-radius: 5px;
-    -moz-box-shadow: 0px 0px 4px #222;
-    -webkit-box-shadow: 0px 0px 4px #222;
-    box-shadow: 0px 0px 4px #222;
-    background-color: #333;
-    font-size: 15px;
-    line-height: normal;
-    font-family: Arial, sans-serif;
-}
-
-/* Add Zoom Animation */
-.animate {
-    animation: animatezoom 0.6s
-    -webkit-animation: animatezoom 0.6s;
-}
-
 /* Body */
 body {
    height: 900px;
-
-    background-image: url(https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcTEnqKdVtLbxjKuNsCSCxFRhTOpp3Gm0gsU8bMgA_MeUYyzrUFy);
+    background-color: #C8CABD;
+    /*background-image: url(http://play.pokemonshowdown.com/fx/client-bg-shaymin.jpg);
    background-size: cover;
-    background-repeat: repeat-x;
-    background-attachment: fixed;
+    background-attachment: fixed;*/

    /*background-color: #B78996;*/
    color: #333;
-
    font-family: Arial, sans-serif;
 }

-/* stijl voor alle buttons */
-button {
-    background-color: #845663;
-    border: 2px solid black;
-    border-radius: 12px;
-    color: white;
-    cursor: pointer;
-    height: 50%;
-    margin: 8px 0;
-    padding: 14px 20px;
-    width: 25%;
-    font-family: Arial;
-    font-size: 16px;
-}
-
 /* The Close Button */
 .close {
  /* Position it in the top right corner outside of the modal */
@@ -106,20 +45,18 @@ button {
 /* inlogform */
 form {
    /*background-color: #a87a87;*/
-    border: 5px solid #325da3;
-    background-color: #a87a87;
    border-radius: 12px;
-    height: 55%;
-    margin: 35px auto;
-    width: 45%;
+    height: 75%;
+    margin: 10px auto;
+    width: 70%;
    overflow-y:auto;
 }

 /* inlog titel */
 h1 {
-    padding: 16px;
+    padding: 8px;
    text-align: center;
-    font-size: 2.2em;
+    font-size: 1.5em;
 }

 /* registreer titel*/
@@ -130,30 +67,34 @@ h2 {
 }

 input[type=text], input[type=password], input[type=email], input[type="date"] {
-    border-radius: 12px;
-    border: 5px solid #ccc;
    box-sizing: border-box;
+    border-color: #C8CABD;
    display: inline-block;
    height: 50%;
    padding: 8px 20px;
    margin: 4px 0;
    width: 50%;
-    font-family: Arial;
-    font-size: 16px;
 }
+/*
+input[type=text], input[type=password], input[type=email], input[type="date"] {
+    border: 0px;
+    border-bottom: 4px solid lightgray;
+    border-radius: 0px;
+}*/

 button[type=submit] {
-    background-color: #845663;
-    border: 2px solid black;
-    border-radius: 12px;
-    color: white;
+    background-color: #C8CABD;
+    color: black  ;
    cursor: pointer;
-    height: 50%;
-    margin: 8px 0;
-    padding: 14px 20px;
-    width: 50%;
    font-family: Arial;
    font-size: 16px;
+    width: 50%;
+}
+
+.error {
+    font-family: Arial;
+    font-size: 15px;
+    color: red;
 }

 label {
@@ -179,52 +120,31 @@ label {
    color: red;
 }

-/* The Modal (background) */
-.modal {
-    background-color: rgb(0,0,0); /* Fallback color */
-    background-color: rgba(0,0,0,0.4); /* Black w/ opacity */
-    display: none; /* Hidden by default */
-    height: 100%;
-    left: 0;
-    margin: auto;
-    overflow: auto; /* Enable scroll if needed */
-    padding-top: 60px;
-    position: fixed; /* Stay in place */
-    top: 0;
-    width: 100%; /* Full width */
-    z-index: 1; /* Sit on top */
-}
-
-/* Modal Content/Box */
-.modal-content {
-    background-color: #B78996;
-    border: 5px solid #325da3;
-    margin: 5px auto; /* 15% from the top and centered */
-    overflow-y: auto;
-    width: 40%; /* Could be more or less, depending on screen size */
-    height: 60%;
-
-}
-
@keyframes animatezoom {
    from {transform: scale(0)}
    to {transform: scale(1)}
 }

-/* datepicker */
-select {
-    border-radius: 12px;
-    border: 5px solid #ccc;
-    box-sizing: border-box;
-    display: inline-block;
-    height: 50%;
-    padding: 12px 20px;
-    margin: 8px 0;
-    width: 18%;
-    font-family: Arial;
-    font-size: 16px;
+/* White boxes (squares) */
+.platform {
+    background-color: #FFFFFF;
+    /*background-image: url(http://www.planwallpaper.com/static/images/518071-background-hd_xO1TwRc.jpg);
+    background-size: cover;
+    background-repeat: repeat-x;
+    background-attachment: fixed;*/
+    box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24);
+    height: 53%;
+    margin: 34px auto;
+    overflow-y: auto;
+    padding: 20px;
+    width: 35%;
 }

+/*.platform {
+  width: 40%;
+  margin: 34px auto;
+}*/
+
@-webkit-keyframes animatezoom {
    from {-webkit-transform: scale(0)}
    to {-webkit-transform: scale(1)}
--- a/website/public/styles/menu.css
+++ b/website/public/styles/menu.css
@@ -30,9 +30,14 @@
    cursor: pointer;
 }

+.friend-item:hover {
+    background: #845663;
+    color: white;
+}
+
 .menu button {
    background: none;
-    color: #333;
+    color: inherit;
    width: 100%;
    height: 100%;
    padding: 0;
--- a/website/public/template_sql.php
+++ b/website/public/template_sql.php
@@ -7,7 +7,7 @@
 include_once("../queries/connect.php");
 include_once("../queries/friendship.php");

-$friends = selectAllFriends($db, 666);
+$friends = selectAllFriends(666);
 while($friend = $friends->fetch(PDO::FETCH_ASSOC)) {
    echo $friend['username'].' '.$friend['onlinestatus'] . "<br />";
 }
--- a/website/queries/checkInput.php
+++ b/website/queries/checkInput.php
@@ -0,0 +1,105 @@
+<?php
+/**
+ * Function for checking inputfields
+ * @param variable $variable Give name of the inputfield.
+ * @param string $option Give the name of the option.
+ * @return sets correct to false and gives value to error message if it doesn't pass the checks.
+ */
+function checkInputChoice($variable, $option){
+    if (empty($_POST[$variable])) {
+        $GLOBALS[$variable . "Err"] = "Verplicht!";
+        $GLOBALS["correct"] = false;
+
+    } else {
+        $GLOBALS[$variable] = test_input($_POST[$variable]);
+        switch ($option) {
+          case "lettersAndSpace":
+            checkonly($variable);
+            break;
+
+          case "username";
+            username($variable);
+            break;
+
+          case "longerEight";
+            longerEight($variable);
+            break;
+
+          case "email";
+            validateEmail($variable);
+            break;
+
+          default:
+            break;
+        }
+    }
+}
+
+/* Checks for only letters and spaces. */
+function checkOnly($variable){
+    if (!preg_match("/^[a-zA-Z ]*$/",$GLOBALS[$variable])) {
+        $GLOBALS[$variable . "Err"] = "Alleen letters en spaties zijn toegestaan!";
+        $correct = false;
+    }
+}
+/* checks if username exist and if its longer than 6 characters. */
+function username($variable){
+    if (strlen($GLOBALS[$variable]) < 6) {
+        $GLOBALS[$variable . "Err"] = "Gebruikersnaam moet minstens 6 karakters bevatten";
+        $correct = false;
+    } else if (getExistingUsername() == 1) {
+        $GLOBALS[$variable . "Err"] = "Gebruikersnaam bestaat al";
+        $correct = false;
+    }
+}
+
+/* checks if an input is longer that 8 characters. */
+function longerEight($variable){
+    if (strlen($GLOBALS[$variable]) < 8) {
+        $GLOBALS[$variable . "Err"] = "Moet minstens 8 karakters bevatten";
+        $correct = false;
+    }
+}
+
+/* checks if an input is a valid email. */
+function validateEmail($variable){
+    if (!filter_var($GLOBALS[$variable], FILTER_VALIDATE_EMAIL)) {
+        $GLOBALS[$variable . "Err"] = "Geldige email invullen!";
+        $correct = false;
+
+    } else if (getExistingEmail() == 1){
+        $GLOBALS[$variable . "Err"] = "Email bestaat al";
+        $correct = false;
+
+    }
+}
+
+/* checks if two passwords matches. */
+function matchPassword(){
+    if ($_POST["password"] != $_POST["confirmpassword"]) {
+        $GLOBALS["confirmpasswordErr"] = "Wachtwoorden matchen niet";
+        $GLOBALS["correct"]  = false;
+
+    }
+}
+
+// Checks if everything is filled in correctly
+function registerCheck(){
+    if ($GLOBALS["correct"] == false){
+        $GLOBALS["genericErr"] = "Bepaalde velden zijn verkeerd of niet ingevuld!";
+
+    } else {
+        registerAccount();
+        header("location: login.php");
+
+    }
+}
+
+/* removes weird characters of an input. */
+function test_input($data) {
+    $data = trim($data);
+    $data = stripslashes($data);
+    $data = htmlspecialchars($data);
+    return $data;
+}
+?>
--- a/website/queries/friendship.php
+++ b/website/queries/friendship.php
@@ -1,26 +1,31 @@
 <?php

-function selectAllFriends($db, $userID) {
-    return $db->query("
-    SELECT
-        `user`.`userID`,
-        `user`.`username`,
-        `user`.`profilepicture`,
-        `user`.`onlinestatus`,
-        `user`.`role`
-    FROM
-        `user`    
-    INNER JOIN
-        `friendship`
-    WHERE
-        `friendship`.`user1ID` = $userID AND
-        `friendship`.`user2ID` = `user`.`userID` OR
-        `friendship`.`user2ID` = $userID AND
-        `friendship`.`user1ID` = `user`.`userID` AND
-        `user`.`role` != 3
+function selectAllFriends($userID) {
+    $stmt = $GLOBALS["db"]->prepare("
+        SELECT
+            `userID`,
+            `username`,
+            IFNULL(
+                `profilepicture`,
+                '../img/notbad.jpg'
+            ) AS profilepicture,
+            `onlinestatus`,
+            `role`
+        FROM
+            `user`
+        INNER JOIN
+            `friendship`
+        WHERE
+            (`friendship`.`user1ID` = :userID AND
+            `friendship`.`user2ID` = `user`.`userID` OR 
+            `friendship`.`user2ID` = :userID AND
+            `friendship`.`user1ID` = `user`.`userID`) AND
+            `role` != 5 AND
+            `status` = 1
    ");
-}

+    $stmt->bindParam(':userID', $userID, PDO::PARAM_INT);
+    $stmt->execute();

-
-?>
+    return $stmt;
+}
--- a/website/queries/group_member.php
+++ b/website/queries/group_member.php
@@ -1,7 +1,7 @@
 <?php

-function selectAllGroupsFromUser($db, $userID) {
-    return $db->query("
+function selectAllGroupsFromUser($userID) {
+    return $GLOBALS["db"]->query("
    SELECT
        `group_page`.`name`,
        `group_page`.`picture`
@@ -15,7 +15,3 @@ function selectAllGroupsFromUser($db, $userID) {
        `group_page`.`status` != 0
    ");
 }
-
-
-
-?>
--- a/website/queries/group_page.php
+++ b/website/queries/group_page.php
@@ -1,7 +1,7 @@
 <?php

-function selectGroupById($db, $groupID) {
-    return $db->query("
+function selectGroupById($groupID) {
+    return $GLOBALS["db"]->query("
    SELECT
        `group_page`.`name`,
        `group_page`.`picture`,
@@ -15,8 +15,8 @@ function selectGroupById($db, $groupID) {
    ");
 }

-function select20GroupsFromN($db, $n) {
-    return $db->query("
+function select20GroupsFromN($n) {
+    return $GLOBALS["db"]->query("
    SELECT
        `group_page`.`groupID`,
        `group_page`.`name`,
@@ -33,8 +33,8 @@ function select20GroupsFromN($db, $n) {
    ");
 }

-function select20GroupsByStatusFromN($db, $n, $status) {
-    return $db->query("
+function select20GroupsByStatusFromN($n, $status) {
+    return $GLOBALS["db"]->query("
    SELECT
        `group_page`.`groupID`,
        `group_page`.`name`,
@@ -53,8 +53,8 @@ function select20GroupsByStatusFromN($db, $n, $status) {
    ");
 }

-function search20GroupsFromNByStatus($db, $n, $keyword, $status) {
-    $q = $db->prepare("
+function search20GroupsFromNByStatus($n, $keyword, $status) {
+    $q = $GLOBALS["db"]->prepare("
    SELECT
        `groupID`,
        `name`,
@@ -129,8 +129,8 @@ function countSomeGroupsByStatus($db, $keyword, $status) {
    return $q;
 }

-function changeGroupStatusByID($db, $id, $status) {
-    $q = $db->query("
+function changeGroupStatusByID($id, $status) {
+    $q = $GLOBALS["db"]->query("
    UPDATE
        `group_page`
    SET
@@ -141,6 +141,7 @@ function changeGroupStatusByID($db, $id, $status) {

    return $q;
 }
+<<<<<<< HEAD


 function changeMultipleGroupStatusByID($db, $ids, $status) {
@@ -162,3 +163,5 @@ function changeMultipleGroupStatusByID($db, $ids, $status) {


 ?>
+=======
+>>>>>>> master
--- a/website/queries/header.php
+++ b/website/queries/header.php
@@ -0,0 +1,21 @@
+<?php
+function getHeaderInfo() {
+    $stmt = $GLOBALS["db"]->prepare("
+    SELECT
+        `fname`,
+        `lname`,
+        IFNULL(
+            `profilepicture`,
+            'img/notbad.jpg'
+        ) AS profilepicture
+    FROM
+        `user`
+    WHERE
+        `userID` = :userID
+    ");
+
+    $stmt->bindParam(":userID", $_SESSION["userID"]);
+    $stmt->execute();
+
+    return $stmt->fetch();
+}
--- a/website/queries/login.php
+++ b/website/queries/login.php
@@ -1,6 +1,6 @@
 <?php

-function hashPassword() {
+function getUser() {
    $stmt = $GLOBALS["db"]->prepare("
    SELECT
      `password`,
@@ -15,5 +15,3 @@ function hashPassword() {
    $stmt->execute();
    return $stmt->fetch(PDO::FETCH_ASSOC);
 }
-
-?>
--- a/website/queries/private_message.php
+++ b/website/queries/private_message.php
@@ -1,14 +1,9 @@
 <?php

-include_once("connect.php");
-
-session_start();
-
 function getOldChatMessages($user2ID) {
-    $db = $GLOBALS["db"];
    $user1ID = $_SESSION["userID"];

-    $stmt = $db->prepare("
+    $stmt = $GLOBALS["db"]->prepare("
    SELECT
        *
    FROM
@@ -31,8 +26,7 @@ function getOldChatMessages($user2ID) {
 }

 function sendMessage($destination, $content) {
-    $db = $GLOBALS["db"];
-    $stmt = $db->prepare("
+    $stmt = $GLOBALS["db"]->prepare("
    INSERT INTO
        `private_message`
    (
@@ -56,10 +50,7 @@ function sendMessage($destination, $content) {
 }

 function getNewChatMessages($lastID, $destination) {
-    $db = $GLOBALS["db"];
-    $origin = $_SESSION["userID"];
-
-    $stmt = $db->prepare("
+    $stmt = $GLOBALS["db"]->prepare("
    SELECT
        *
    FROM
@@ -75,11 +66,11 @@ function getNewChatMessages($lastID, $destination) {
        `messageID` ASC
    ");

-    $stmt->bindParam(':user1', $origin);
+    $stmt->bindParam(':user1', $_SESSION["userID"]);
    $stmt->bindParam(':user2', $destination);
    $stmt->bindParam(':lastID', $lastID);

    $stmt->execute();

    return json_encode($stmt->fetchAll());
-}
+}
--- a/website/queries/register.php
+++ b/website/queries/register.php
@@ -52,7 +52,7 @@ function registerAccount() {
      :email
    )");

-    $hash=password_hash($_POST["password"].(strtolower($_POST["username"])), PASSWORD_DEFAULT);
+    $hash=password_hash($_POST["password"], PASSWORD_DEFAULT);

    $stmt->bindParam(":fname", $_POST["name"]);
    $stmt->bindParam(":lname", $_POST["surname"]);
--- a/website/queries/settings.php
+++ b/website/queries/settings.php
@@ -1,5 +1,42 @@
 <?php

+class settingsMessage {
+    private $class;
+    private $message;
+
+    /**
+     * settingsMessage constructor.
+     * @param string $type Happy or angry
+     * @param string $message The message to display
+     */
+    public function __construct($type, $message) {
+        $this->message = $message;
+        switch ($type) {
+            case "happy":
+                $this->class = "settings-message-happy";
+                break;
+            case "angry":
+                $this->class = "settings-message-angry";
+                break;
+            default:
+                $this->class = "settings-message";
+                break;
+        }
+    }
+
+    public function getClass() {
+        return $this->class;
+    }
+
+    public function getMessage() {
+        return $this->message;
+    }
+}
+
+/**
+ * Gets the settings form the database.
+ * @return mixed Setting as an array.
+ */
 function getSettings() {
    $stmt = $GLOBALS["db"]->prepare("
    SELECT
@@ -59,40 +96,28 @@ function updateSettings() {

    $stmt->execute();

-    return array (
-        "type" => "settings-message-happy",
-        "message" => "Instellingen zijn opgeslagen."
-        );
+    return new settingsMessage("happy", "Instellingen zijn opgeslagen.");
 }

 function updatePassword() {
    $user = getPasswordHash();
-    if (password_verify($_POST["password-old"].strtolower($user["username"]), $user["password"])) {
+    if (password_verify($_POST["password-old"], $user["password"])) {
        if ($_POST["password-new"] == $_POST["password-confirm"] && (strlen($_POST["password-new"]) >= 8)) {
-            if (changePassword($user)) {
-                return array ("type" => "settings-message-happy",
-                    "message" => "Wachtwoord gewijzigd.");
+            if (changePassword()) {
+                return new settingsMessage("happy", "Wachtwoord gewijzigd.");
            } else {
-                return array (
-                "type" => "settings-message-angry",
-                "message" => "Er is iets mis gegaan.");
+                return new settingsMessage("angry", "Er is iets mis gegaan.");
            }
        } else {
-            return array (
-                "type" => "settings-message-angry",
-                "message" => "Wachtwoorden komen niet oveeen."
-            );
+            return new settingsMessage("angry", "Wachtwoorden komen niet oveen.");
        }
    } else {
-        return array(
-            "type" => "settings-message-angry",
-            "message" => "Oud wachtwoord niet correct."
-        );
+        return new settingsMessage("angry", "Oud wachtwoord niet correct.");
    }
 }

-function changePassword($user) {
-    $stmt =$GLOBALS["db"]->prepare("
+function changePassword() {
+    $stmt = $GLOBALS["db"]->prepare("
    UPDATE
      `user`
    SET
@@ -101,9 +126,62 @@ function changePassword($user) {
      `userID` = :userID
    ");

-    $hashed_password = password_hash($_POST["password-new"].strtolower($user["username"]), PASSWORD_DEFAULT);
+    $hashed_password = password_hash($_POST["password-new"], PASSWORD_DEFAULT);
    $stmt->bindParam(":new_password", $hashed_password);
    $stmt->bindParam(":userID", $_SESSION["userID"]);
    $stmt->execute();
    return $stmt->rowCount();
+}
+
+function changeEmail() {
+
+    if ($_POST["email"] == $_POST["email-confirm"]) {
+        $email = strtolower($_POST["email"]);
+        if (filter_var($email, FILTER_VALIDATE_EMAIL)) {
+            //check if email exists
+            if (emailIsAvailableInDatabase($email)) {
+                if (doChangeEmail($email)) {
+                    return new settingsMessage("happy", "Emailadres is veranderd.");
+                } else {
+                    return new settingsMessage("angry", "Er is iets mis gegaan.");
+                }
+            } else {
+                return new settingsMessage("angry", "Emailadres bestaat al.");
+            }
+        } else {
+            return new settingsMessage("angry", "Geef een geldig emailadres.");
+        }
+    } else {
+        return new settingsMessage("angry", "Emailadressen komen niet overeen.");
+    }
+}
+
+function emailIsAvailableInDatabase($email) {
+    $stmt = $GLOBALS["db"]->prepare("
+    SELECT
+        `email`
+    FROM
+        `user`
+    WHERE 
+      `email` = :email
+    ");
+
+    $stmt->bindParam(":email", $email);
+    $stmt->execute();
+    return !$stmt->rowCount();
+}
+
+function doChangeEmail($email) {
+    $stmt = $GLOBALS["db"]->prepare("
+    UPDATE
+        `user`
+    SET
+      `email` = :email
+    WHERE
+      `userID` = :userID
+    ");
+    $stmt->bindParam(":email", $email);
+    $stmt->bindParam(":userID", $_SESSION["userID"]);
+    $stmt->execute();
+    return $stmt->rowCount();
 }
--- a/website/queries/user.php
+++ b/website/queries/user.php
@@ -1,7 +1,93 @@
 <?php
+require("connect.php");

-function select20UsersFromN($db, $n) {
-    return $db->query("
+function getUserID($username) {
+    $stmt = $GLOBALS["db"]->prepare("
+        SELECT
+            `userID`
+        FROM
+            `user`
+        WHERE
+            LOWER(`username`) = LOWER(:username)
+    ");
+
+    $stmt->bindParam(':username', $username, PDO::PARAM_STR);
+    $stmt->execute();
+    return $stmt->fetch()["userID"];
+}
+
+function selectUser($userID) {
+    $stmt = $GLOBALS["db"]->prepare("
+        SELECT
+            `username`,
+            IFNULL(
+                `profilepicture`,
+                '../img/notbad.jpg'
+            ) AS profilepicture,
+            `bio`,
+            `role`,
+            `onlinestatus`,
+            `loggedin`,
+            `fname`,
+            `lname`
+        FROM
+            `user`
+        WHERE
+            `userID` = :userID
+    ");
+
+    $stmt->bindParam(':userID', $userID, PDO::PARAM_INT);
+    $stmt->execute();
+    return $stmt->fetch();
+}
+
+function selectAllUserGroups($userID) {
+    $stmt = $GLOBALS["db"]->prepare("
+        SELECT
+            `group_page`.`groupID`,
+            `name`,
+            `picture`,
+            `userID`
+        FROM
+            `group_page`
+        INNER JOIN
+            `group_member`
+        ON
+            `group_page`.`groupID` = `group_member`.`groupID`
+        WHERE
+            `userID` = :userID AND
+            `role` = 1
+    ");
+
+    $stmt->bindParam(':userID', $userID, PDO::PARAM_INT);
+    $stmt->execute();
+    return $stmt;
+}
+
+function selectAllUserPosts($userID) {
+    $stmt = $GLOBALS["db"]->prepare("
+        SELECT
+            `postID`,
+            `author`,
+            `title`,
+            `content`,
+            `creationdate`
+        FROM
+             `post`
+        WHERE
+            `author` = :userID AND
+            `groupID` IS NULL
+        ORDER BY
+            `creationdate` DESC
+    ");
+
+    $stmt->bindParam(':userID', $userID, PDO::PARAM_INT);
+    $stmt->execute();
+    return $stmt;
+}
+
+function select20UsersFromN($n) {
+    return $GLOBALS["db"]->query("
    SELECT
        `userID`,
        `username`,
@@ -17,8 +103,8 @@ function select20UsersFromN($db, $n) {
    ");
 }

-function search20UsersFromN($db, $n, $keyword) {
-    $q = $db->prepare("
+function search20UsersFromN($n, $keyword) {
+    $q = $GLOBALS["db"]->prepare("
    SELECT
        `userID`,
        `username`,
@@ -41,8 +127,8 @@ function search20UsersFromN($db, $n, $keyword) {
    return $q;
 }

-function search20UsersFromNByStatus($db, $n, $keyword, $status) {
-    $q = $db->prepare("
+function search20UsersFromNByStatus($n, $keyword, $status) {
+    $q = $GLOBALS["db"]->prepare("
    SELECT
        `userID`,
        `username`,
@@ -120,8 +206,9 @@ function countSomeUsersByStatus($db, $keyword, $status) {
    return $q;
 }

-function changeUserStatusByID($db, $id, $status) {
-    $q = $db->query("
+
+function changeUserStatusByID($id, $status) {
+    $q = $GLOBALS["db"]->query("
    UPDATE
        `user`
    SET
--- a/website/views/adminpanel.php
+++ b/website/views/adminpanel.php
@@ -99,8 +99,15 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
        changeMultipleGroupStatusByID($db, $_POST["checkbox-group"], $_POST["groupbatchactions"]);
    }

+<<<<<<< HEAD
    if (isset($_POST["pageselect"])) {
        $currentpage = $_POST["pageselect"];
+=======
+    if (!empty($_POST["actions"]) && !empty($_POST["userID"])) {
+        changeUserStatusByID($_POST["userID"], $_POST["actions"]);
+    } elseif (!empty($_POST["actions"]) && !empty($_POST["groupID"])) {
+        changeGroupStatusByID($_POST["groupID"], $_POST["actions"]);
+>>>>>>> master
    }

 }
--- a/website/views/chat-view.php
+++ b/website/views/chat-view.php
@@ -6,11 +6,8 @@
                <?php
                include_once("../queries/friendship.php");

-                if (empty($_SESSION["userID"]))
-                    $_SESSION["userID"] = 2;
-
                // Get all the friends of a user.
-                $friends = selectAllFriends($db, $_SESSION["userID"]);
+                $friends = selectAllFriends($_SESSION["userID"]);
                $i = 0;

                // Print all the users.
@@ -28,7 +25,7 @@

                    // Echo the friend.
                    echo "
-                        <li class='friend-item' onclick='switchUser(\"$userID\")'>
+                        <li class='friend-item' id='friend-item-$userID' onclick='switchUser(\"$userID\")'>
                            <div class='friend'>
                                <img alt='PF' class='profile-picture' src='$pf'/>
                                $username
@@ -38,12 +35,6 @@
                }
                ?>
            </ul>
-            <!--            <a href="#">-->
-            <!--                <div class="chat-conversation">-->
-            <!--                    <img class="profile-picture" src="https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcTDnuRSeeyPve7KwDvJJ6OBzj3gyghwLcE2z9kZeYBOyZavh3mw">-->
-            <!--                    Rudolf Leslo-->
-            <!--                </div>-->
-            <!--            </a>-->
        </nav>
        <div class="chat-right right">
            <div id="chat-history" class="chat-history platform">
@@ -74,7 +65,7 @@
                        <input type="text"
                               name="content"
                               id="newContent"
-                               placeholder="Reageer..."
+                               placeholder="Schrijf een bericht..."
                               autofocus
                               required
                        />
--- a/website/views/head.php
+++ b/website/views/head.php
@@ -18,3 +18,7 @@
 include_once("../queries/connect.php");

 session_start();
+
+if(!isset($_SESSION["userID"])){
+    header("location:login.php");
+}
--- a/website/views/header.php
+++ b/website/views/header.php
@@ -1,3 +1,8 @@
+<?php
+include_once ("../queries/header.php");
+
+$userinfo = getHeaderInfo();
+?>
 <header>
    <div id="header-logo">
        <a href="profile.php"><img src="img/top-logo.png" alt="MyHyvesbook+" /></a>
@@ -15,7 +20,7 @@
    </div>
    <div class="right profile-menu">
        <div id="profile-menu-popup">
-            <a href="index.php"><span style="color: red;" class="fa fa-sign-out" data-title="Uitloggen"></span></a> |
+            <a href="logout.php"><span style="color: red;" class="fa fa-sign-out" data-title="Uitloggen"></span></a> |
            <a href="settings.php"><span style="color: blue;" class="fa fa-cog" data-title="Instellingen"></span></a> |
            <a href="profile.php"><span style="color: green;" class="fa fa-user" data-title="Profiel"></span></a>
        </div>
@@ -23,9 +28,9 @@
            <div id="hello-loop">
                Hallo
            </div>
-            Bart
+            <?=$userinfo["fname"]?>
        </div>
-        <img id="own-profile-picture" class="profile-picture" src="data:image/jpeg;base64,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" />
+        <img id="own-profile-picture" class="profile-picture" src="<?=$userinfo["profilepicture"]?>"/>
    </div>
    <a href="chat.php"><div class="right fa fa-comments-o" id="open-chat" data-title="Prive chats"></div></a>
 </header>
--- a/website/views/login-view.php
+++ b/website/views/login-view.php
@@ -3,49 +3,49 @@
         src="img/top-logo.png"
         alt="MyHyvesbook+">
 </div>
-
-<!-- Login content  -->
-<form action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]);?>"
-      return= $correct
-      method="post">
+<div class="platform">
    <h1>Welkom bij MyHyvesbook+</h1>
+    <!-- Login content  -->
+    <form action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]);?>"
+          return= $correct
+          method="post">

-    <!-- Login name -->
+        <!-- Login name -->
+        <div class="login_containerlogin">
+            <label><b>Gebruikersnaam</b></label>
+            <input type="text"
+                   placeholder="Voer uw gebruikersnaam in"
+                   name="uname"
+                   value="<?php echo $uname ?>"
+                   title="Moet 6 of meer karakters bevatten"
+                   >
+        </div>
+
+        <!-- Login password -->
+        <div class="login_containerlogin">
+            <label><b>Wachtwoord</b></label>
+            <input type="password"
+                   placeholder="Voer uw wachtwoord in"
+                   name="psw"
+                   title="Moet minstens 8 karakters lang zijn"
+                   >
+        </div>
+
+        <!-- Error message -->
+        <div class="login_containerfault"><span><?php echo $loginErr; ?></span></div>
+
+        <!-- Button for logging in -->
+        <div class="login_containerlogin">
+            <button type="submit"
+                   value="Login"
+                   name="submit"
+                   id="frm1_submit">
+            Login
+            </button>
+        </div>
+    </form>
+    <!-- Button for going to the register screen -->
    <div class="login_containerlogin">
-        <label><b>Gebruikersnaam</b></label>
-        <input type="text"
-               placeholder="Voer uw gebruikersnaam in"
-               name="uname"
-               value="<?php echo $uname ?>"
-               title="Moet 6 of meer karakters bevatten"
-               >
+      <a href="https://myhyvesbookplus.nl/register.php" class="button">Registreer een account</a>
    </div>
-
-    <!-- Login password -->
-    <div class="login_containerlogin">
-        <label><b>Wachtwoord</b></label>
-        <input type="password"
-               placeholder="Voer uw wachtwoord in"
-               name="psw"
-               title="Moet minstens 8 karakters lang zijn"
-               >
-    </div>
-
-    <!-- Error message -->
-    <div class="login_containerfault"><span><?php echo $loginErr; ?></span></div>
-
-    <!-- Button for logging in -->
-    <div class="login_containerlogin">
-        <button type="submit"
-               value="Login"
-               name="submit"
-               id="frm1_submit">
-        Login
-        </button>
-    </div>
-</form>
-
-<!-- Button for going to the register screen -->
-<div class="login_containerlogin">
-    <a href="https://myhyvesbookplus.nl/~joey/public/register.php" class="button">Registreer een account</a>
 </div>
--- a/website/views/login_head.php
+++ b/website/views/login_head.php
@@ -1,6 +1,9 @@
 <head>
    <meta charset="utf-8">
    <title>MyHyvesbook+</title>
+    <link rel="stylesheet"
+          type="text/css"
+          href="styles/main.css">
    <link rel="stylesheet"
          type="text/css"
          href="styles/index.css">
--- a/website/views/menu.php
+++ b/website/views/menu.php
@@ -9,11 +9,8 @@
            // Load file.
            include_once("../queries/friendship.php");

-            if (empty($_SESSION["userID"]))
-                $_SESSION["userID"] = 2;
-
            // Get all the friends of a user.
-            $friends = selectAllFriends($db, $_SESSION["userID"]);
+            $friends = selectAllFriends($_SESSION["userID"]);
            $i = 0;

            // Print all the users.
@@ -69,7 +66,7 @@
            include_once("../queries/group_member.php");

            // Get all the friends of a user.
-            $groups = selectAllGroupsFromUser($db, $_SESSION["userID"]);
+            $groups = selectAllGroupsFromUser($_SESSION["userID"]);
            $i = 0;

            // Print all the users.
--- a/website/views/profile.php
+++ b/website/views/profile.php
@@ -1,113 +1,56 @@
 <div class="content">
    <div class="profile-box platform">
-        <img class="left profile-picture" src="http://i.imgur.com/afjEUx2.jpg">
+        <img class="left profile-picture" src="<?php echo $user["profilepicture"] ?>">
        <div class="profile-button">
            <p><img src="img/add-friend.png"> Als vriend toevoegen</p>
        </div>
-        <h1 class="profile-username">[gebruikersnaam]</h1>
-        <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec dictum turpis quam, eu ultrices sapien hendrerit tincidunt. Nunc aliquam neque turpis, id porta quam iaculis id. Sed suscipit, nisl a fermentum congue, nunc augue finibus lectus, id varius nunc purus nec dolor. Integer laoreet tellus sit amet sapien auctor congue. Mauris laoreet eu elit vel rhoncus. Nam et tortor arcu. Maecenas sit amet leo quis tellus varius gravida. Sed quis fermentum odio, sed dictum nulla. Donec aliquam rutrum orci cursus tempus. Quisque sit amet ipsum eget velit aliquam facilisis ultricies quis ligula. Nunc nisi lacus, luctus non bibendum quis, sagittis sit amet odio.</p>
+        <h1 class="profile-username"><?= $user["fname"]?> <?=$user["lname"]?> (<?=$user["username"]?>)</h1>
+        <p><?=$user["bio"]?></p>
    </div>

    <div class="item-box left platform">
        <h2>Vrienden</h2>
        <p>
-            <a href="#" data-title="[gebruikersnaam]"><img class="profile-picture" src="http://i.imgur.com/afjEUx2.jpg" alt="[gebruikersnaam]'s profielfoto"></a>
-            <a href="#" data-title="[gebruikersnaam]"><img class="profile-picture" src="http://i.imgur.com/afjEUx2.jpg" alt="[gebruikersnaam]'s profielfoto"></a>
-            <a href="#" data-title="[gebruikersnaam]"><img class="profile-picture" src="http://i.imgur.com/afjEUx2.jpg" alt="[gebruikersnaam]'s profielfoto"></a>
-            <a href="#" data-title="[gebruikersnaam]"><img class="profile-picture" src="http://i.imgur.com/afjEUx2.jpg" alt="[gebruikersnaam]'s profielfoto"></a>
-            <a href="#" data-title="[gebruikersnaam]"><img class="profile-picture" src="http://i.imgur.com/afjEUx2.jpg" alt="[gebruikersnaam]'s profielfoto"></a>
-            <a href="#vrienden">...en nog 25 anderen!</a>
+            <?php
+                while($friend = $profile_friends->fetch()) {
+                    echo "<a href='#' data-title='${friend["username"]}'><img class='profile-picture' src='${friend["profilepicture"]}' alt='${friend["username"]}'s profielfoto></a>";
+                }
+
+
+                if($friends->rowCount() === 0) {
+                    echo "<p>Deze gebruiker heeft nog geen vrienden gemaakt.</p>";
+                }
+            ?>
        </p>
    </div>

    <div class="item-box right platform">
        <h2>Groepen</h2>
        <p>
-            <a href="#" data-title="[groepsnaam]"><img class="group-picture" src="http://i.imgur.com/ztYhYro.png" alt="[groepsnaam]'s logo"></a>
-            <a href="#" data-title="[groepsnaam]"><img class="group-picture" src="http://i.imgur.com/ztYhYro.png" alt="[groepsnaam]'s logo"></a>
-            <a href="#" data-title="[groepsnaam]"><img class="group-picture" src="http://i.imgur.com/ztYhYro.png" alt="[groepsnaam]'s logo"></a>
-            <a href="#" data-title="[groepsnaam]"><img class="group-picture" src="http://i.imgur.com/ztYhYro.png" alt="[groepsnaam]'s logo"></a>
-            <a href="#" data-title="[groepsnaam]"><img class="group-picture" src="http://i.imgur.com/ztYhYro.png" alt="[groepsnaam]'s logo"></a>
-            <a href="#groepen">...en nog 6 anderen!</a>
+            <?php
+                while($group = $profile_groups->fetch()) {
+                    echo "<a href='#' data-title='${group["name"]}'><img class='group-picture' src='${group["picture"]}' alt='${group["name"]}s logo'></a>";
+                }
+
+                if($groups->rowCount() === 0) {
+                    echo "<p>Deze gebruiker is nog geen lid van een groep.</p>";
+                }
+            ?>
        </p>
    </div>

    <div class="posts">
-        <div class="post platform">
-            <h2>Lorem</h2>
-            <p>Lorem ipsum dolor sit amet, consectetur.</p>
-            <p class="subscript">Enkele minuten geleden geplaatst</p>
-        </div>
-        <div class="post platform">
-            <h2>Image</h2>
-            <img src="http://i.imgur.com/ypIQKjE.jpg" alt="Olympic Mountains, Washington">
-            <p class="subscript">Gisteren geplaatst</p>
-        </div>
-        <div class="post platform">
-            <h2>Ipsum</h2>
-            <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Rem nihil alias amet dolores fuga totam sequi a cupiditate ipsa voluptas id facilis nobis.</p>
-            <p class="subscript">Maandag geplaatst</p>
-        </div>
-        <div class="post platform">
-            <h2>Dolor</h2>
-            <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit.</p>
-            <p class="subscript">4 Januari geplaatst</p>
-        </div>
-        <div class="post platform">
-            <h2>Sit</h2>
-            <p>Lorem ipsum dolor sit.</p>
-            <p class="subscript">4 Januari geplaatst</p>
-        </div>
-        <div class="post platform">
-            <h2>Image</h2>
-            <img src="https://i.redditmedia.com/EBWWiEojgkRrdn89R7qF7tBZjJszJaIqgkWUH23s11A.jpg?w=576&s=ba4fe1f02485cb2327305924ef869a66" alt="Nunobiki Falls, Kobe Japan">
-            <p class="subscript">4 Januari geplaatst</p>
-        </div>
-        <div class="post platform">
-            <h2>Amet</h2>
-            <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Minima asperiores eveniet vero velit eligendi aliquid in.</p>
-            <p class="subscript">4 Januari geplaatst</p>
-        </div>
-        <div class="post platform">
-            <h2>Consectetur</h2>
-            <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Error aliquid reprehenderit expedita odio beatae est.</p>
-            <p class="subscript">4 Januari geplaatst</p>
-        </div>
-        <div class="post platform">
-            <h2>Adipisicing</h2>
-            <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Quaerat architecto quis tenetur fugiat veniam iste molestiae fuga labore!</p>
-            <p class="subscript">4 Januari geplaatst</p>
-        </div>
-        <div class="post platform">
-            <h2>Elit</h2>
-            <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Rem ut debitis dolorum earum expedita eveniet voluptatem quibusdam facere eos numquam commodi ad iusto laboriosam rerum aliquam.</p>
-            <p class="subscript">4 Januari geplaatst</p>
-        </div>
-        <div class="post platform">
-            <h2>Geen error</h2>
-            <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Doloribus dolorem maxime minima animi cum.</p>
-            <p class="subscript">4 Januari geplaatst</p>
-        </div>
-        <div class="post platform">
-            <h2>Image</h2>
-            <img src="https://i.reddituploads.com/82c1c4dd0cfb4a4aa1cfa16f93f5dbfa?fit=max&h=1536&w=1536&s=dd629d407f3646ee6e3adb4da78c93f2" alt="Oregon cliffs are no joke.">
-            <p class="subscript">4 Januari geplaatst</p>
-        </div>
-        <div class="post platform">
-            <h2>Aliquid</h2>
-            <p>Lorem ipsum dolor sit amet, consectetur.</p>
-            <p class="subscript">4 Januari geplaatst</p>
-        </div>
-        <div class="post platform">
-            <h2>Odit</h2>
-            <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Odit accusamus tempore at porro officia rerum est impedit ea ipsa tenetur. Labore libero hic error sunt laborum expedita.</p>
-            <p class="subscript">4 Januari geplaatst</p>
-        </div>
-        <div class="post platform">
-            <h2>Accusamus</h2>
-            <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Nobis quaerat suscipit ad.</p>
-            <p class="subscript">4 Januari geplaatst</p>
-        </div>
+        <?php
+            while($post = $posts->fetch()) {
+                $nicetime = nicetime($post["creationdate"]);
+                echo "
+                    <div class='post platform'>
+                        <h2>${post["title"]}</h2>
+                        <p>${post["content"]}</p>
+                        <p class=\"subscript\">${nicetime} geplaatst.</p>
+                    </div>
+                ";
+            }
+        ?>
    </div>
-
 </div>
--- a/website/views/register-view.php
+++ b/website/views/register-view.php
@@ -4,132 +4,132 @@
         alt="MyHyvesbook+">
 </div>

-<!-- Register Content -->
-<form action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]);?>"
-      return= $correct
-      method="post">
-    <h2>Registreer uw account</h2>
+<div class="platform">
+  <h1>Registreer uw account</h1>
+    <!-- Register Content -->
+    <form action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]);?>"
+          return= $correct
+          method="post">

-    <!-- Error message -->
-    <div class="login_containerfault"><?php echo $genericErr;?></span></div>
+        <!-- Error message -->
+        <div class="login_containerfault"><?php echo $genericErr;?></span></div>

-    <!-- Register name -->
-    <div class="login_containerregister">
-        <label><b>Naam</b></label>
-        <input type="text"
-               placeholder="Voer uw naam in"
-               name="name"
-               value="<?php echo $name ?>"
-               title="Mag alleen letters bevatten"
-               >
-        <span class="error">* <?php echo $nameErr;?></span>
+        <!-- Register name -->
+        <div class="login_containerregister">
+            <label><b>Naam</b></label>
+            <input type="text"
+                   placeholder="Voer uw naam in"
+                   name="name"
+                   value="<?php echo $name ?>"
+                   title="Mag alleen letters bevatten"
+                   >
+            *<span class="error"><?php echo $nameErr;?></span>
+        </div>
+
+        <!-- Register surname -->
+        <div class="login_containerregister">
+            <label><b>Achternaam</b></label>
+            <input type="text"
+                   placeholder="Voer uw achternaam in"
+                   name="surname"
+                   value="<?php echo $surname ?>"
+                   title="Mag alleen letters bevatten"
+                   >
+            *<span class="error"> <?php echo $surnameErr;?></span>
+        </div>
+
+        <!-- Register birthday -->
+        <div class="login_containerregister">
+            <label><b>Geboortedatum</b></label>
+            <input type="date"
+                   name="bday"
+                   value="<?php echo $bday ?>"
+                   id="bday"
+                   placeholder="01/01/1900"
+                   >
+            *<span class="error"> <?php echo $bdayErr;?></span>
+        </div>
+
+        <!-- Register username -->
+        <div class="login_containerregister">
+            <label><b>Gebruikersnaam</b></label>
+            <input type="text"
+                   placeholder="Voer uw gebruikersnaam in"
+                   name="username"
+                   value="<?php echo $username ?>"
+                   title="Moet minimaal 6 karakters bevatten"
+                   >
+            *<span class="error"> <?php echo $usernameErr;?></span>
+            <ul>
+                <li>Minstens 6 karakters</li>
+            </ul>
+          </div>
+
+
+        <!-- Register password -->
+        <div class="login_containerregister">
+            <label><b>Wachtwoord</b></label>
+            <input type="password"
+                   placeholder="Voer uw wachtwoord in"
+                   name="password"
+                   value="<?php echo $password ?>"
+                   id="password"
+                   >
+            *<span class="error"> <?php echo $passwordErr;?></span>
+        <ul>
+          <li>Minstens 8 karakters</li>
+        </ul>
+        </div>
+        <!-- Repeat password -->
+        <div class="login_containerregister">
+            <label><b>Herhaal wachtwoord</b></label>
+            <input type="password"
+                   placeholder="Herhaal wachtwoord"
+                   name="confirmpassword"
+                   value="<?php echo $confirmpassword ?>"
+                   id="confirmpassword"
+                   title="Herhaal wachtwoord"
+                  >
+            *<span class="error"> <?php echo $confirmpasswordErr;?></span>
+        </div>
+
+        <!-- Register location -->
+        <div class="login_containerregister">
+            <label><b>Woonplaats</b></label>
+            <input type="text"
+                   placeholder="Voer uw woonplaats in"
+                   name="location"
+                   value="<?php echo $location ?>"
+                   pattern="[A-Za-z]{1,}"
+                   title="Mag alleen letters bevatten">
+            *<span class="error"> <?php echo $locationErr;?></span>
+        </div>
+
+        <!-- Register email -->
+        <div class="login_containerregister">
+            <label><b>Email</b></label>
+            <input type="text"
+                   placeholder="Voer uw email in"
+                   name="email"
+                   value="<?php echo $email ?>"
+                   id="email"
+                   title="Voer een geldige email in">
+            *<span class="error"> <?php echo $emailErr;?></span>
+        </div>
+
+        <!-- Button for registering -->
+        <div class="login_containerregister">
+            <button type="submit"
+                   value="Registreer uw account"
+                   name="Submit"
+                   id="frm1_submit">
+            Registreer uw account
+            </button>
+        </div>
+    </form>
+
+    <!-- Button for going back to login screen -->
+    <div class="login_containerlogin">
+        <a href="https://myhyvesbookplus.nl/login.php" class="button">Login met een account</a>
    </div>
-
-    <!-- Register surname -->
-    <div class="login_containerregister">
-        <label><b>Achternaam</b></label>
-        <input type="text"
-               placeholder="Voer uw achternaam in"
-               name="surname"
-               value="<?php echo $surname ?>"
-               title="Mag alleen letters bevatten"
-               >
-        <span class="error">* <?php echo $surnameErr;?></span>
-    </div>
-
-    <!-- Register birthday -->
-    <div class="login_containerregister">
-        <label><b>Geboortedatum</b></label>
-        <input type="date"
-               name="bday"
-               value="<?php echo $bday ?>"
-               id="bday"
-               placeholder="01/01/1900"
-               >
-        <span class="error">* <?php echo $bdayErr;?></span>
-    </div>
-
-    <!-- Register username -->
-    <div class="login_containerregister">
-        <label><b>Gebruikersnaam</b></label>
-        <input type="text"
-               placeholder="Voer uw gebruikersnaam in"
-               name="username"
-               value="<?php echo $username ?>"
-               title="Moet minimaal 6 karakters bevatten"
-               >
-        <span class="error">* <?php echo $usernameErr;?></span>
-    </div>
-
-    <ul>
-      <li>Minstens 6 karakters</li>
-    </ul>
-
-    <!-- Register password -->
-    <div class="login_containerregister">
-        <label><b>Wachtwoord</b></label>
-        <input type="password"
-               placeholder="Voer uw wachtwoord in"
-               name="password"
-               value="<?php echo $password ?>"
-               id="password"
-               >
-        <span class="error">* <?php echo $passwordErr;?></span>
-    </div>
-
-    <ul>
-      <li>Minstens 8 karakters</li>
-    </ul>
-
-    <!-- Repeat password -->
-    <div class="login_containerregister">
-        <label><b>Herhaal wachtwoord</b></label>
-        <input type="password"
-               placeholder="Herhaal wachtwoord"
-               name="confirmpassword"
-               value="<?php echo $confirmpassword ?>"
-               id="confirmpassword"
-               title="Herhaal wachtwoord"
-              >
-        <span class="error">* <?php echo $confirmpasswordErr;?></span>
-    </div>
-
-    <!-- Register location -->
-    <div class="login_containerregister">
-        <label><b>Woonplaats</b></label>
-        <input type="text"
-               placeholder="Voer uw woonplaats in"
-               name="location"
-               value="<?php echo $location ?>"
-               pattern="[A-Za-z]{1,}"
-               title="Mag alleen letters bevatten">
-        <span class="error">* <?php echo $locationErr;?></span>
-    </div>
-
-    <!-- Register email -->
-    <div class="login_containerregister">
-        <label><b>Email</b></label>
-        <input type="email"
-               placeholder="Voer uw email in"
-               name="email"
-               value="<?php echo $email ?>"
-               id="email"
-               title="Voer een geldige email in">
-        <span class="error">* <?php echo $emailErr;?></span>
-    </div>
-
-    <!-- Button for registering -->
-    <div class="login_containerregister">
-        <button type="submit"
-               value="Registreer uw account"
-               name="Submit"
-               id="frm1_submit">
-        Registreer uw account
-        </button>
-    </div>
-</form>
-
-<!-- Button for going back to login screen -->
-<div class="login_containerlogin">
-    <a href="https://myhyvesbookplus.nl/~joey/public/login.php" class="button">Login met een account</a>
 </div>
--- a/website/views/settings-view.php
+++ b/website/views/settings-view.php
@@ -6,9 +6,9 @@ $settings = getSettings();
    <div class="settings">
        <?php
        if ($_SERVER["REQUEST_METHOD"] == "POST") {
-            echo "<div class='platform settings-message ${result["type"]}'>
-            ${result["message"]}
-        </div>";
+            echo "<div class='platform settings-message ". $result->getClass()."'>".
+            $result->getMessage().
+        "</div>";
        }
        ?>
        <form class="settings-profile platform" method="post">