From 380b256d292630a028a0096036c6568d2b351343 Mon Sep 17 00:00:00 2001
From: Lars van Hijfte <larsvanhijfte@hotmail.com>
Date: Wed, 18 Jan 2017 16:20:33 +0100
Subject: [PATCH 01/16] added this file because it is needed

---
 website/public/loadMessages.php | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 website/public/loadMessages.php

diff --git a/website/public/loadMessages.php b/website/public/loadMessages.php
new file mode 100644
index 0000000..fb9f129
--- /dev/null
+++ b/website/public/loadMessages.php
@@ -0,0 +1,11 @@
+<?php
+
+include_once("../queries/private_message.php");
+
+if (isset($_POST["lastID"]) && $_POST["lastID"] != "") {
+
+    echo getNewChatMessages($_POST["lastID"], $_POST["destination"]);
+
+} else {
+    echo getOldChatMessages($_POST["destination"]);
+}
\ No newline at end of file

From e4ec666e038d3554ff2b536a742ee20337945b29 Mon Sep 17 00:00:00 2001
From: Marijn Jansen <marijn@jansen.onl>
Date: Wed, 18 Jan 2017 16:22:27 +0100
Subject: [PATCH 02/16] Added personal Header

---
 website/queries/header.php | 17 +++++++++++++++++
 website/views/header.php   | 10 ++++++++--
 2 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 website/queries/header.php

diff --git a/website/queries/header.php b/website/queries/header.php
new file mode 100644
index 0000000..5e78291
--- /dev/null
+++ b/website/queries/header.php
@@ -0,0 +1,17 @@
+<?php
+function getHeaderInfo() {
+    $stmt = $GLOBALS["db"]->prepare("
+    SELECT
+      `fname`,
+      `lname`,
+      `profilepicture`
+    FROM
+      `user`
+    WHERE
+      `userID` = :userID
+    ");
+    $stmt->bindParam(":userID", $_SESSION["userID"]);
+    $stmt->execute();
+    return $stmt->fetch();
+
+}
\ No newline at end of file
diff --git a/website/views/header.php b/website/views/header.php
index af3d0f0..12877b6 100644
--- a/website/views/header.php
+++ b/website/views/header.php
@@ -1,3 +1,9 @@
+<?php
+session_start();
+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>
@@ -23,9 +29,9 @@
             <div id="hello-loop">
                 Hallo
             </div>
-            Bart
+            <?=$userinfo["fname"]?> <?=$userinfo["lname"]?>
         </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>

From 1fb6c90fa6748f2dd91112a812f289278fd1329d Mon Sep 17 00:00:00 2001
From: Marijn Jansen <marijn@jansen.onl>
Date: Wed, 18 Jan 2017 16:41:45 +0100
Subject: [PATCH 03/16] Session Start doubble fixes

---
 website/views/header.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/website/views/header.php b/website/views/header.php
index 12877b6..bb809ee 100644
--- a/website/views/header.php
+++ b/website/views/header.php
@@ -1,5 +1,4 @@
 <?php
-session_start();
 include_once ("../queries/header.php");
 
 $userinfo = getHeaderInfo();

From 08e0447d4c9081abd48bae4143670ce67d9aef77 Mon Sep 17 00:00:00 2001
From: Marijn Jansen <marijn@jansen.onl>
Date: Thu, 19 Jan 2017 11:00:55 +0100
Subject: [PATCH 04/16] Ignore .idea folder

---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 49adb33..9479d1a 100644
--- 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

From ff19b5e1b9d33ae2f3d6c374a1e762997f52c2e9 Mon Sep 17 00:00:00 2001
From: Marijn Jansen <marijn@jansen.onl>
Date: Thu, 19 Jan 2017 11:01:29 +0100
Subject: [PATCH 05/16] Settings messages now uses a Class (:

---
 website/public/settings.php     | 12 ++----
 website/queries/settings.php    | 67 ++++++++++++++++++++++-----------
 website/views/settings-view.php |  6 +--
 3 files changed, 53 insertions(+), 32 deletions(-)

diff --git a/website/public/settings.php b/website/public/settings.php
index 2f91690..c3645f1 100644
--- a/website/public/settings.php
+++ b/website/public/settings.php
@@ -5,6 +5,7 @@
     include("../views/head.php");
     include_once("../queries/connect.php");
     include_once("../queries/settings.php");
+    $_SESSION["userID"] = 2;
     ?>
     <style>
         @import url("styles/settings.css");
@@ -14,6 +15,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 +26,10 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
             $result = updatePassword();
             break;
         case "email":
-            $result = array (
-                "type" => "settings-message-angry",
-                "message" => "Deze functie werkt nog niet :("
-            );
+            $result = $notImplemented;
             break;
         case "picture":
-            $result = array (
-                "type" => "settings-message-angry",
-                "message" => "Deze functie werkt nog niet :("
-            );
+            $result = $notImplemented;
             break;
     }
 }
diff --git a/website/queries/settings.php b/website/queries/settings.php
index c59ff7f..e3d4936 100644
--- 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,39 +96,27 @@ 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("settings-message-angry", "Er is iets mis gegaan.");
             }
         } else {
-            return array (
-                "type" => "settings-message-angry",
-                "message" => "Wachtwoorden komen niet oveeen."
-            );
+            return new settingsMessage("settings-message-angry", "Wachtwoorden komen niet oveeen.");
         }
     } else {
-        return array(
-            "type" => "settings-message-angry",
-            "message" => "Oud wachtwoord niet correct."
-        );
+        return new settingsMessage("settings-message-angry", "Oud wachtwoord niet correct.");
     }
 }
 
-function changePassword($user) {
+function changePassword() {
     $stmt =$GLOBALS["db"]->prepare("
     UPDATE
       `user`
@@ -101,7 +126,7 @@ 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();
diff --git a/website/views/settings-view.php b/website/views/settings-view.php
index ab6161e..6d9d660 100644
--- 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">

From b71cf367984e88df4489da5007aa52b3ed801f88 Mon Sep 17 00:00:00 2001
From: Lars van Hijfte <larsvanhijfte@hotmail.com>
Date: Thu, 19 Jan 2017 11:08:55 +0100
Subject: [PATCH 06/16] Fixed chat

It now has a userID again,
displays which user you are chatting withhover over user changes different background
---
 website/public/{ => API}/loadMessages.php |  2 +-
 website/public/{ => API}/sendMessage.php  |  2 +-
 website/public/js/chat.js                 | 13 +++++++++++--
 website/public/styles/chat.css            |  5 +++++
 website/public/styles/menu.css            |  7 ++++++-
 website/queries/friendship.php            |  3 ++-
 website/queries/header.php                | 13 ++++++++-----
 website/queries/private_message.php       |  2 +-
 website/views/chat-view.php               | 10 ++--------
 9 files changed, 37 insertions(+), 20 deletions(-)
 rename website/public/{ => API}/loadMessages.php (79%)
 rename website/public/{ => API}/sendMessage.php (86%)

diff --git a/website/public/loadMessages.php b/website/public/API/loadMessages.php
similarity index 79%
rename from website/public/loadMessages.php
rename to website/public/API/loadMessages.php
index fb9f129..532c53f 100644
--- a/website/public/loadMessages.php
+++ b/website/public/API/loadMessages.php
@@ -1,6 +1,6 @@
 <?php
 
-include_once("../queries/private_message.php");
+include_once("../../queries/private_message.php");
 
 if (isset($_POST["lastID"]) && $_POST["lastID"] != "") {
 
diff --git a/website/public/sendMessage.php b/website/public/API/sendMessage.php
similarity index 86%
rename from website/public/sendMessage.php
rename to website/public/API/sendMessage.php
index e555e2a..4f69023 100644
--- a/website/public/sendMessage.php
+++ b/website/public/API/sendMessage.php
@@ -1,6 +1,6 @@
 <?php
 
-include_once("../queries/private_message.php");
+include_once("../../queries/private_message.php");
 
 if (isset($_POST["destination"]) &&
     isset($_POST["content"])) {
diff --git a/website/public/js/chat.js b/website/public/js/chat.js
index cf33f69..75eb32e 100644
--- 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!");
 }
\ No newline at end of file
diff --git a/website/public/styles/chat.css b/website/public/styles/chat.css
index 8f486bb..e2fa7c9 100644
--- 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;
 }
\ No newline at end of file
diff --git a/website/public/styles/menu.css b/website/public/styles/menu.css
index 45163de..6cdae65 100644
--- 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;
diff --git a/website/queries/friendship.php b/website/queries/friendship.php
index 14fa6ee..17bbef4 100644
--- a/website/queries/friendship.php
+++ b/website/queries/friendship.php
@@ -4,10 +4,11 @@ require("connect.php");
 function selectAllFriends($db, $userID) {
     $stmt = $db->prepare("
         SELECT
+            `userID`,
             `username`,
             IFNULL(
                 `profilepicture`,
-                'img/notbad.png'
+                'img/notbad.jpg'
             ) AS profilepicture,
             `onlinestatus`,
             `role`
diff --git a/website/queries/header.php b/website/queries/header.php
index 5e78291..1743552 100644
--- a/website/queries/header.php
+++ b/website/queries/header.php
@@ -2,13 +2,16 @@
 function getHeaderInfo() {
     $stmt = $GLOBALS["db"]->prepare("
     SELECT
-      `fname`,
-      `lname`,
-      `profilepicture`
+        `fname`,
+        `lname`,
+        IFNULL(
+            `profilepicture`,
+            'img/notbad.jpg'
+        ) AS profilepicture
     FROM
-      `user`
+        `user`
     WHERE
-      `userID` = :userID
+        `userID` = :userID
     ");
     $stmt->bindParam(":userID", $_SESSION["userID"]);
     $stmt->execute();
diff --git a/website/queries/private_message.php b/website/queries/private_message.php
index 2d953c5..a32f931 100644
--- a/website/queries/private_message.php
+++ b/website/queries/private_message.php
@@ -1,6 +1,6 @@
 <?php
 
-include_once("connect.php");
+require_once("connect.php");
 
 session_start();
 
diff --git a/website/views/chat-view.php b/website/views/chat-view.php
index a3acd4c..b63d6b8 100644
--- a/website/views/chat-view.php
+++ b/website/views/chat-view.php
@@ -28,7 +28,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 +38,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 +68,7 @@
                         <input type="text"
                                name="content"
                                id="newContent"
-                               placeholder="Reageer..."
+                               placeholder="Schrijf een bericht..."
                                autofocus
                                required
                         />

From b37d06e2cc0a67d8819773fdf1ba9a56d3884375 Mon Sep 17 00:00:00 2001
From: "K. Nobel" <kevlebon@gmailcom>
Date: Thu, 19 Jan 2017 11:55:23 +0100
Subject: [PATCH 07/16] Updated queries

---
 website/queries/friendship.php | 5 +++--
 website/queries/user.php       | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/website/queries/friendship.php b/website/queries/friendship.php
index 14fa6ee..a3a2fb8 100644
--- a/website/queries/friendship.php
+++ b/website/queries/friendship.php
@@ -2,12 +2,12 @@
 require("connect.php");
 
 function selectAllFriends($db, $userID) {
-    $stmt = $db->prepare("
+    $stmt = $GLOBALS["db"]->prepare("
         SELECT
             `username`,
             IFNULL(
                 `profilepicture`,
-                'img/notbad.png'
+                '../img/notbad.jpg'
             ) AS profilepicture,
             `onlinestatus`,
             `role`
@@ -26,5 +26,6 @@ function selectAllFriends($db, $userID) {
 
     $stmt->bindParam(':userID', $userID, PDO::PARAM_INT);
     $stmt->execute();
+
     return $stmt;
 }
\ No newline at end of file
diff --git a/website/queries/user.php b/website/queries/user.php
index 659e0d6..de76ff7 100644
--- a/website/queries/user.php
+++ b/website/queries/user.php
@@ -22,7 +22,7 @@ function selectUser($db, $userID) {
             `username`,
             IFNULL(
                 `profilepicture`,
-                'img/notbad.png'
+                '../img/notbad.jpg'
             ) AS profilepicture,
             `bio`,
             `role`,
@@ -42,7 +42,7 @@ function selectUser($db, $userID) {
 }
 
 function selectAllUserGroups($db, $userID) {
-    $stmt = $db->prepare("
+    $stmt = $GLOBALS["db"]->prepare("
         SELECT
             `group_page`.`groupID`,
             `name`,
@@ -65,7 +65,7 @@ function selectAllUserGroups($db, $userID) {
 }
 
 function selectAllUserPosts($db, $userID) {
-    $stmt = $db->prepare("
+    $stmt = $GLOBALS["db"]->prepare("
         SELECT
             `postID`,
             `author`,

From 186cdf1445359a359883df72d3c208379e68da6f Mon Sep 17 00:00:00 2001
From: Lars van Hijfte <larsvanhijfte@hotmail.com>
Date: Thu, 19 Jan 2017 11:57:54 +0100
Subject: [PATCH 08/16] Made $db global

---
 website/public/API/loadMessages.php |  4 +++-
 website/public/API/sendMessage.php  |  4 +++-
 website/public/profile.php          | 10 ++++-----
 website/public/template_sql.php     |  2 +-
 website/queries/friendship.php      |  6 +++---
 website/queries/group_member.php    |  8 ++------
 website/queries/group_page.php      | 25 +++++++++-------------
 website/queries/header.php          |  5 +++--
 website/queries/login.php           |  2 --
 website/queries/private_message.php | 19 +++++------------
 website/queries/user.php            | 32 ++++++++++++++---------------
 website/views/adminpanel.php        |  8 ++++----
 website/views/chat-view.php         |  5 +----
 website/views/menu.php              |  7 ++-----
 14 files changed, 58 insertions(+), 79 deletions(-)

diff --git a/website/public/API/loadMessages.php b/website/public/API/loadMessages.php
index 532c53f..fef9db7 100644
--- a/website/public/API/loadMessages.php
+++ b/website/public/API/loadMessages.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["lastID"]) && $_POST["lastID"] != "") {
 
diff --git a/website/public/API/sendMessage.php b/website/public/API/sendMessage.php
index 4f69023..d1bc758 100644
--- 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"])) {
diff --git a/website/public/profile.php b/website/public/profile.php
index 4854080..562bfb8 100644
--- a/website/public/profile.php
+++ b/website/public/profile.php
@@ -46,12 +46,12 @@ if(empty($_GET["username"])) {
     return;
 }
 
-$userID = getUserID($db, $_GET["username"]);
+$userID = getUserID($_GET["username"]);
 
-$user = selectUser($db, $userID);
-$friends = selectAllFriends($db, $userID);
-$groups = selectAllUserGroups($db, $userID);
-$posts = selectAllUserPosts($db, $userID);
+$user = selectUser($userID);
+$friends = selectAllFriends($userID);
+$groups = selectAllUserGroups($userID);
+$posts = selectAllUserPosts($userID);
 
 ?>
 
diff --git a/website/public/template_sql.php b/website/public/template_sql.php
index b918f6a..ed4ff99 100644
--- 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 />";
 }
diff --git a/website/queries/friendship.php b/website/queries/friendship.php
index 17bbef4..f058c70 100644
--- a/website/queries/friendship.php
+++ b/website/queries/friendship.php
@@ -1,8 +1,7 @@
 <?php
-require("connect.php");
 
-function selectAllFriends($db, $userID) {
-    $stmt = $db->prepare("
+function selectAllFriends($userID) {
+    $stmt = $GLOBALS["db"]->prepare("
         SELECT
             `userID`,
             `username`,
@@ -27,5 +26,6 @@ function selectAllFriends($db, $userID) {
 
     $stmt->bindParam(':userID', $userID, PDO::PARAM_INT);
     $stmt->execute();
+
     return $stmt;
 }
\ No newline at end of file
diff --git a/website/queries/group_member.php b/website/queries/group_member.php
index 824a33b..f8a9002 100644
--- 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
     ");
 }
-
-
-
-?>
\ No newline at end of file
diff --git a/website/queries/group_page.php b/website/queries/group_page.php
index c6db01b..6763e3f 100644
--- 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`,
@@ -80,8 +80,8 @@ function search20GroupsFromNByStatus($db, $n, $keyword, $status) {
     return $q;
 }
 
-function changeGroupStatusByID($db, $id, $status) {
-    $q = $db->query("
+function changeGroupStatusByID($id, $status) {
+    $q = $GLOBALS["db"]->query("
     UPDATE
         `group_page`
     SET
@@ -92,8 +92,3 @@ function changeGroupStatusByID($db, $id, $status) {
 
     return $q;
 }
-
-
-
-
-?>
diff --git a/website/queries/header.php b/website/queries/header.php
index 1743552..e6bc8ac 100644
--- a/website/queries/header.php
+++ b/website/queries/header.php
@@ -13,8 +13,9 @@ function getHeaderInfo() {
     WHERE
         `userID` = :userID
     ");
+
     $stmt->bindParam(":userID", $_SESSION["userID"]);
     $stmt->execute();
-    return $stmt->fetch();
 
-}
\ No newline at end of file
+    return $stmt->fetch();
+}
diff --git a/website/queries/login.php b/website/queries/login.php
index c710833..8f2eb19 100644
--- a/website/queries/login.php
+++ b/website/queries/login.php
@@ -15,5 +15,3 @@ function hashPassword() {
     $stmt->execute();
     return $stmt->fetch(PDO::FETCH_ASSOC);
 }
-
-?>
diff --git a/website/queries/private_message.php b/website/queries/private_message.php
index a32f931..46c21a3 100644
--- a/website/queries/private_message.php
+++ b/website/queries/private_message.php
@@ -1,14 +1,9 @@
 <?php
 
-require_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());
-}
\ No newline at end of file
+}
diff --git a/website/queries/user.php b/website/queries/user.php
index 659e0d6..d5fea1b 100644
--- a/website/queries/user.php
+++ b/website/queries/user.php
@@ -1,8 +1,8 @@
 <?php
 require("connect.php");
 
-function getUserID($db, $username) {
-    $stmt = $db->prepare("
+function getUserID($username) {
+    $stmt = $GLOBALS["db"]->prepare("
         SELECT
             `userID`
         FROM
@@ -16,8 +16,8 @@ function getUserID($db, $username) {
     return $stmt->fetch()["userID"];
 }
 
-function selectUser($db, $userID) {
-    $stmt = $db->prepare("
+function selectUser($userID) {
+    $stmt = $GLOBALS["db"]->prepare("
         SELECT
             `username`,
             IFNULL(
@@ -41,8 +41,8 @@ function selectUser($db, $userID) {
     return $stmt->fetch();
 }
 
-function selectAllUserGroups($db, $userID) {
-    $stmt = $db->prepare("
+function selectAllUserGroups($userID) {
+    $stmt = $GLOBALS["db"]->prepare("
         SELECT
             `group_page`.`groupID`,
             `name`,
@@ -64,8 +64,8 @@ function selectAllUserGroups($db, $userID) {
     return $stmt;
 }
 
-function selectAllUserPosts($db, $userID) {
-    $stmt = $db->prepare("
+function selectAllUserPosts($userID) {
+    $stmt = $GLOBALS["db"]->prepare("
         SELECT
             `postID`,
             `author`,
@@ -86,8 +86,8 @@ function selectAllUserPosts($db, $userID) {
     return $stmt;
 }
 
-function select20UsersFromN($db, $n) {
-    return $db->query("
+function select20UsersFromN($n) {
+    return $GLOBALS["db"]->query("
     SELECT
         `userID`,
         `username`,
@@ -103,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`,
@@ -127,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`,
@@ -155,8 +155,8 @@ function search20UsersFromNByStatus($db, $n, $keyword, $status) {
     return $q;
 }
 
-function changeUserStatusByID($db, $id, $status) {
-    $q = $db->query("
+function changeUserStatusByID($id, $status) {
+    $q = $GLOBALS["db"]->query("
     UPDATE
         `user`
     SET
diff --git a/website/views/adminpanel.php b/website/views/adminpanel.php
index 5a3ba97..c98c051 100644
--- a/website/views/adminpanel.php
+++ b/website/views/adminpanel.php
@@ -61,9 +61,9 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
     }
 
     if (!empty($_POST["actions"]) && !empty($_POST["userID"])) {
-        changeUserStatusByID($db, $_POST["userID"], $_POST["actions"]);
+        changeUserStatusByID($_POST["userID"], $_POST["actions"]);
     } elseif (!empty($_POST["actions"]) && !empty($_POST["groupID"])) {
-        changeGroupStatusByID($db, $_POST["groupID"], $_POST["actions"]);
+        changeGroupStatusByID($_POST["groupID"], $_POST["actions"]);
     }
 
 }
@@ -183,7 +183,7 @@ function test_input($data) {
                     <!-- Table construction via php PDO. -->
                     <?php
                     if ($pagetype == 'user') {
-                        $q = search20UsersFromNByStatus($db, $listnr, $search, $status);
+                        $q = search20UsersFromNByStatus($listnr, $search, $status);
 
                         while($user = $q->fetch(PDO::FETCH_ASSOC)) {
                             $userID = $user['userID'];
@@ -218,7 +218,7 @@ function test_input($data) {
                             ");
                         }
                     } else {
-                        $q = search20GroupsFromNByStatus($db, $listnr, $search, $groupstatus);
+                        $q = search20GroupsFromNByStatus($listnr, $search, $groupstatus);
 
                         while ($group = $q->fetch(PDO::FETCH_ASSOC)) {
                             $groupID = $group['groupID'];
diff --git a/website/views/chat-view.php b/website/views/chat-view.php
index b63d6b8..09b52ca 100644
--- 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.
diff --git a/website/views/menu.php b/website/views/menu.php
index 731b284..775c76a 100644
--- 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.

From 84719529bb091c26193c9ddc49a7fecdeb81d718 Mon Sep 17 00:00:00 2001
From: "K. Nobel" <kevlebon@gmailcom>
Date: Thu, 19 Jan 2017 12:01:39 +0100
Subject: [PATCH 09/16] Fixed queries and profile page.

---
 website/public/profile.php     | 10 +++++-----
 website/queries/friendship.php |  2 +-
 website/queries/user.php       | 12 ++++++------
 website/views/menu.php         |  2 +-
 website/views/profile.php      | 12 +++++++-----
 5 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/website/public/profile.php b/website/public/profile.php
index 4854080..e35935b 100644
--- a/website/public/profile.php
+++ b/website/public/profile.php
@@ -46,12 +46,12 @@ if(empty($_GET["username"])) {
     return;
 }
 
-$userID = getUserID($db, $_GET["username"]);
+$userID = getUserID($_GET["username"]);
 
-$user = selectUser($db, $userID);
-$friends = selectAllFriends($db, $userID);
-$groups = selectAllUserGroups($db, $userID);
-$posts = selectAllUserPosts($db, $userID);
+$user = selectUser($userID);
+$profile_friends = selectAllFriends($userID);
+$profile_groups = selectAllUserGroups($userID);
+$posts = selectAllUserPosts($userID);
 
 ?>
 
diff --git a/website/queries/friendship.php b/website/queries/friendship.php
index a3a2fb8..f13fed5 100644
--- a/website/queries/friendship.php
+++ b/website/queries/friendship.php
@@ -1,7 +1,7 @@
 <?php
 require("connect.php");
 
-function selectAllFriends($db, $userID) {
+function selectAllFriends($userID) {
     $stmt = $GLOBALS["db"]->prepare("
         SELECT
             `username`,
diff --git a/website/queries/user.php b/website/queries/user.php
index de76ff7..c6e691a 100644
--- a/website/queries/user.php
+++ b/website/queries/user.php
@@ -1,8 +1,8 @@
 <?php
 require("connect.php");
 
-function getUserID($db, $username) {
-    $stmt = $db->prepare("
+function getUserID($username) {
+    $stmt = $GLOBALS["db"]->prepare("
         SELECT
             `userID`
         FROM
@@ -16,8 +16,8 @@ function getUserID($db, $username) {
     return $stmt->fetch()["userID"];
 }
 
-function selectUser($db, $userID) {
-    $stmt = $db->prepare("
+function selectUser($userID) {
+    $stmt = $GLOBALS["db"]->prepare("
         SELECT
             `username`,
             IFNULL(
@@ -41,7 +41,7 @@ function selectUser($db, $userID) {
     return $stmt->fetch();
 }
 
-function selectAllUserGroups($db, $userID) {
+function selectAllUserGroups($userID) {
     $stmt = $GLOBALS["db"]->prepare("
         SELECT
             `group_page`.`groupID`,
@@ -64,7 +64,7 @@ function selectAllUserGroups($db, $userID) {
     return $stmt;
 }
 
-function selectAllUserPosts($db, $userID) {
+function selectAllUserPosts($userID) {
     $stmt = $GLOBALS["db"]->prepare("
         SELECT
             `postID`,
diff --git a/website/views/menu.php b/website/views/menu.php
index 731b284..83ebfc0 100644
--- a/website/views/menu.php
+++ b/website/views/menu.php
@@ -13,7 +13,7 @@
                 $_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.
diff --git a/website/views/profile.php b/website/views/profile.php
index 395dd15..6c273a6 100644
--- a/website/views/profile.php
+++ b/website/views/profile.php
@@ -4,18 +4,19 @@
         <div class="profile-button">
             <p><img src="img/add-friend.png"> Als vriend toevoegen</p>
         </div>
-        <h1 class="profile-username"><?php echo $user["username"] ?></h1>
-        <p><?php echo $user["bio"] ?></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>
             <?php
-                while($friend = $friends->fetch()) {
-                    echo "<a href='#' data-title='" . $friend["username"] . "'><img class='profile-picture' src='" . $friend["profilepicture"] . "' alt='" . $friend["username"] . "'s profielfoto></a>";
+                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>";
                 }
@@ -27,7 +28,7 @@
         <h2>Groepen</h2>
         <p>
             <?php
-                while($group = $groups->fetch()) {
+                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>";
                 }
 
@@ -51,4 +52,5 @@
                 ";
             }
         ?>
+    </div>
 </div>
\ No newline at end of file

From 049dee63813d33c372fff27c9c262a764bb5e550 Mon Sep 17 00:00:00 2001
From: Joey Lai <joeylai96@hotmail.com>
Date: Thu, 19 Jan 2017 13:11:24 +0100
Subject: [PATCH 10/16] Fixed login/register and added logout.php

---
 website/public/login.php        |   8 +-
 website/public/logout.php       |  15 ++
 website/public/register.php     |  50 ++-----
 website/public/styles/index.css | 168 ++++++---------------
 website/queries/login.php       |   2 +-
 website/queries/register.php    |   2 +-
 website/views/header.php        |   2 +-
 website/views/login-view.php    |  82 +++++------
 website/views/login_head.php    |   3 +
 website/views/register-view.php | 250 ++++++++++++++++----------------
 10 files changed, 250 insertions(+), 332 deletions(-)
 create mode 100644 website/public/logout.php

diff --git a/website/public/login.php b/website/public/login.php
index 09dce8c..f889f2f 100644
--- a/website/public/login.php
+++ b/website/public/login.php
@@ -2,7 +2,7 @@
 <html>
 <?php
     include("../views/login_head.php");
-    include_once("../queries/connect.php");
+    require_once("../queries/connect.php");
     include_once("../queries/login.php");
 ?>
 <body>
@@ -23,11 +23,11 @@
         }
         else {
             $psw=$_POST["psw"];
-            $hash=hashPassword()["password"];
-            $userid=hashPassword()["userID"];
+            $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");
 
diff --git a/website/public/logout.php b/website/public/logout.php
new file mode 100644
index 0000000..6a2ba5d
--- /dev/null
+++ 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>
diff --git a/website/public/register.php b/website/public/register.php
index 2299cf0..c454d66 100644
--- a/website/public/register.php
+++ b/website/public/register.php
@@ -2,7 +2,7 @@
 <html>
 <?php
     include("../views/login_head.php");
-    include_once("../queries/connect.php");
+    require_once("../queries/connect.php");
     include_once("../queries/register.php");
 
 ?>
@@ -15,39 +15,6 @@
     $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"])) {
@@ -55,6 +22,7 @@
             $correct = false;
 
         } else {
+            $name = test_input($_POST["name"]);
             if (!preg_match("/^[a-zA-Z ]*$/",$name)) {
                 $nameErr = "Alleen letters en spaties zijn toegestaan!";
                 $correct = false;
@@ -67,6 +35,7 @@
             $correct = false;
 
         } else {
+            $surname = test_input($_POST["surname"]);
             if (!preg_match("/^[a-zA-Z ]*$/",$surname)) {
                 $surnameErr = "Alleen letters en spaties zijn toegestaan!";
                 $correct = false;
@@ -84,13 +53,14 @@
             $correct = false;
 
         } else {
+            $username = test_input($_POST["username"]);
             if (strlen($username) < 6) {
                 $usernameErr = "Gebruikersnaam moet minstens 6 karakters bevatten";
                 $correct = false;
 
             } else if (getExistingUsername() == 1){
                 $usernameErr = "Gebruikersnaam bestaat al";
-                $correct = false; 
+                $correct = false;
 
             }
         }
@@ -100,6 +70,7 @@
             $correct = false;
 
         } else {
+            $password = test_input($_POST["password"]);
             if (strlen($password) < 8) {
                 $passwordErr = "Wachtwoord moet minstens 8 karakters bevatten";
                 $correct = false;
@@ -124,6 +95,7 @@
             $correct = false;
 
         } else {
+            $location = test_input($_POST["location"]);
             if (!preg_match("/^[a-zA-Z ]*$/",$location)) {
                 $locationErr = "Alleen letters en spaties zijn toegestaan!";
                 $correct = false;
@@ -136,6 +108,7 @@
             $correct = false;
 
         } else {
+            $email = test_input($_POST["email"]);
             if (!filter_var($email, FILTER_VALIDATE_EMAIL)) {
                 $emailErr = "Geldige email invullen!";
                 $correct = false;
@@ -158,6 +131,13 @@
         }
     }
 
+    function test_input($data) {
+        $data = trim($data);
+        $data = stripslashes($data);
+        $data = htmlspecialchars($data);
+        return $data;
+    }
+
 /* This view adds register view */
 include("../views/register-view.php");
 ?>
diff --git a/website/public/styles/index.css b/website/public/styles/index.css
index c7d482f..c551fd1 100644
--- 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)}
diff --git a/website/queries/login.php b/website/queries/login.php
index c710833..50dfc9e 100644
--- 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`,
diff --git a/website/queries/register.php b/website/queries/register.php
index 893bb3a..4700e72 100644
--- 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"]);
diff --git a/website/views/header.php b/website/views/header.php
index af3d0f0..dd8f980 100644
--- a/website/views/header.php
+++ b/website/views/header.php
@@ -15,7 +15,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>
diff --git a/website/views/login-view.php b/website/views/login-view.php
index df29cbc..9214a89 100644
--- 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/~joey/public/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>
diff --git a/website/views/login_head.php b/website/views/login_head.php
index 2283b7d..a41e87e 100644
--- 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">
diff --git a/website/views/register-view.php b/website/views/register-view.php
index b7efbc8..f2b9257 100644
--- 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="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>
-
-    <!-- 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>

From d27538a1648a65d8580ab9b56495b4ac0df40004 Mon Sep 17 00:00:00 2001
From: Marijn Jansen <marijn@jansen.onl>
Date: Thu, 19 Jan 2017 13:44:47 +0100
Subject: [PATCH 11/16] Email change implemented!

---
 website/public/settings.php  |  2 +-
 website/queries/settings.php | 61 +++++++++++++++++++++++++++++++++---
 2 files changed, 58 insertions(+), 5 deletions(-)

diff --git a/website/public/settings.php b/website/public/settings.php
index c3645f1..d5bc162 100644
--- a/website/public/settings.php
+++ b/website/public/settings.php
@@ -26,7 +26,7 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
             $result = updatePassword();
             break;
         case "email":
-            $result = $notImplemented;
+            $result = changeEmail();
             break;
         case "picture":
             $result = $notImplemented;
diff --git a/website/queries/settings.php b/website/queries/settings.php
index e3d4936..7c92583 100644
--- a/website/queries/settings.php
+++ b/website/queries/settings.php
@@ -106,18 +106,18 @@ function updatePassword() {
             if (changePassword()) {
                 return new settingsMessage("happy", "Wachtwoord gewijzigd.");
             } else {
-                return new settingsMessage("settings-message-angry", "Er is iets mis gegaan.");
+                return new settingsMessage("angry", "Er is iets mis gegaan.");
             }
         } else {
-            return new settingsMessage("settings-message-angry", "Wachtwoorden komen niet oveeen.");
+            return new settingsMessage("angry", "Wachtwoorden komen niet oveen.");
         }
     } else {
-        return new settingsMessage("settings-message-angry", "Oud wachtwoord niet correct.");
+        return new settingsMessage("angry", "Oud wachtwoord niet correct.");
     }
 }
 
 function changePassword() {
-    $stmt =$GLOBALS["db"]->prepare("
+    $stmt = $GLOBALS["db"]->prepare("
     UPDATE
       `user`
     SET
@@ -131,4 +131,57 @@ function changePassword() {
     $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();
 }
\ No newline at end of file

From dd0c9b35e9f6c92be4c980c195f0f95fc7532211 Mon Sep 17 00:00:00 2001
From: Marijn Jansen <marijn@jansen.onl>
Date: Thu, 19 Jan 2017 13:53:49 +0100
Subject: [PATCH 12/16] No autologin

---
 website/public/settings.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/website/public/settings.php b/website/public/settings.php
index d5bc162..45e50d8 100644
--- a/website/public/settings.php
+++ b/website/public/settings.php
@@ -5,7 +5,6 @@
     include("../views/head.php");
     include_once("../queries/connect.php");
     include_once("../queries/settings.php");
-    $_SESSION["userID"] = 2;
     ?>
     <style>
         @import url("styles/settings.css");

From a71cb8adb60d59996cfa2bbaeb9b1c591395dca8 Mon Sep 17 00:00:00 2001
From: Lars van Hijfte <larsvanhijfte@hotmail.com>
Date: Thu, 19 Jan 2017 14:53:12 +0100
Subject: [PATCH 13/16] Fixed some extra things

---
 website/views/head.php   | 4 ++++
 website/views/header.php | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/website/views/head.php b/website/views/head.php
index 7d701f5..d9a985a 100644
--- 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");
+}
\ No newline at end of file
diff --git a/website/views/header.php b/website/views/header.php
index fb0e9c3..a58e5f0 100644
--- a/website/views/header.php
+++ b/website/views/header.php
@@ -28,7 +28,7 @@ $userinfo = getHeaderInfo();
             <div id="hello-loop">
                 Hallo
             </div>
-            <?=$userinfo["fname"]?> <?=$userinfo["lname"]?>
+            <?=$userinfo["fname"]?>
         </div>
         <img id="own-profile-picture" class="profile-picture" src="<?=$userinfo["profilepicture"]?>"/>
     </div>

From f5fa36c09c60fc6fdd0df326448323a3c33b3277 Mon Sep 17 00:00:00 2001
From: Lars van Hijfte <larsvanhijfte@hotmail.com>
Date: Thu, 19 Jan 2017 14:55:58 +0100
Subject: [PATCH 14/16] added 404 image

---
 website/public/img/error404.jpg | Bin 0 -> 33719 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 website/public/img/error404.jpg

diff --git a/website/public/img/error404.jpg b/website/public/img/error404.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..f6a259aaf0ae70f4097224569b38139b09e6124f
GIT binary patch
literal 33719
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%0AlEG?=%pYQeB#
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
BlSlvn

literal 0
HcmV?d00001


From f535bb10ca1c169a7798fd751fbcfa0f08e156a9 Mon Sep 17 00:00:00 2001
From: "K. Nobel" <kevlebon@gmailcom>
Date: Thu, 19 Jan 2017 15:50:57 +0100
Subject: [PATCH 15/16] added .htaccess

---
 website/.htaccess | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 website/.htaccess

diff --git a/website/.htaccess b/website/.htaccess
new file mode 100644
index 0000000..5c0147b
--- /dev/null
+++ 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]
\ No newline at end of file

From 64ea5d3f68c70a51153d8288d127ebd5cacf004e Mon Sep 17 00:00:00 2001
From: Joey Lai <joeylai96@hotmail.com>
Date: Thu, 19 Jan 2017 15:55:28 +0100
Subject: [PATCH 16/16] Functions with validating

---
 website/mysql_config.xml        |   7 --
 website/public/login.php        |   8 +--
 website/public/register.php     | 124 +++-----------------------------
 website/queries/checkInput.php  |  95 ++++++++++++++++++++++++
 website/views/login-view.php    |   2 +-
 website/views/register-view.php |   4 +-
 6 files changed, 113 insertions(+), 127 deletions(-)
 delete mode 100644 website/mysql_config.xml
 create mode 100644 website/queries/checkInput.php

diff --git a/website/mysql_config.xml b/website/mysql_config.xml
deleted file mode 100644
index de2d929..0000000
--- a/website/mysql_config.xml
+++ /dev/null
@@ -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>
\ No newline at end of file
diff --git a/website/public/login.php b/website/public/login.php
index f889f2f..d8eb62a 100644
--- a/website/public/login.php
+++ b/website/public/login.php
@@ -15,16 +15,16 @@
 
     // 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=getUser()["password"];
-            $userid=getUser()["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, $hash)) {
diff --git a/website/public/register.php b/website/public/register.php
index c454d66..66d1454 100644
--- a/website/public/register.php
+++ b/website/public/register.php
@@ -4,7 +4,7 @@
     include("../views/login_head.php");
     require_once("../queries/connect.php");
     include_once("../queries/register.php");
-
+    include_once("../queries/checkInput.php");
 ?>
 <body>
 <?php
@@ -17,127 +17,25 @@
 
     // 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 {
-            $name = test_input($_POST["name"]);
-            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 {
-            $surname = test_input($_POST["surname"]);
-            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 {
-            $username = test_input($_POST["username"]);
-            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 {
-            $password = test_input($_POST["password"]);
-            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 {
-            $location = test_input($_POST["location"]);
-            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 {
-            $email = test_input($_POST["email"]);
-            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", "longerEigth");
+        checkInputChoice("confirmpassword", "");
+        matchPassword();
+        checkInputChoice("location", "lettersAndSpace");
+        checkInputChoice("email", "email");
+        registerCheck();
     }
-
-    function test_input($data) {
-        $data = trim($data);
-        $data = stripslashes($data);
-        $data = htmlspecialchars($data);
-        return $data;
-    }
-
 /* This view adds register view */
 include("../views/register-view.php");
 ?>
diff --git a/website/queries/checkInput.php b/website/queries/checkInput.php
new file mode 100644
index 0000000..d48e4e0
--- /dev/null
+++ b/website/queries/checkInput.php
@@ -0,0 +1,95 @@
+<?php
+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 "longerEigth";
+            longerEigth($variable);
+            break;
+
+          case "email";
+            validateEmail($variable);
+            break;
+            
+          default:
+            break;
+
+        }
+    }
+}
+
+function checkOnly($variable){
+    if (!preg_match("/^[a-zA-Z ]*$/",$GLOBALS[$variable])) {
+        $GLOBALS[$variable . "Err"] = "Alleen letters en spaties zijn toegestaan!";
+        $correct = false;
+    }
+}
+
+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;
+    }
+}
+
+function longerEigth($variable){
+    if (strlen($GLOBALS[$variable]) < 8) {
+        $GLOBALS[$variable . "Err"] = "Moet minstens 8 karakters bevatten";
+        $correct = false;
+    }
+}
+
+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;
+
+    }
+}
+
+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");
+
+    }
+}
+
+function test_input($data) {
+    $data = trim($data);
+    $data = stripslashes($data);
+    $data = htmlspecialchars($data);
+    return $data;
+}
+?>
diff --git a/website/views/login-view.php b/website/views/login-view.php
index 9214a89..33fa7e9 100644
--- a/website/views/login-view.php
+++ b/website/views/login-view.php
@@ -46,6 +46,6 @@
     </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>
+      <a href="https://myhyvesbookplus.nl/register.php" class="button">Registreer een account</a>
     </div>
 </div>
diff --git a/website/views/register-view.php b/website/views/register-view.php
index f2b9257..b95dd81 100644
--- a/website/views/register-view.php
+++ b/website/views/register-view.php
@@ -108,7 +108,7 @@
         <!-- Register email -->
         <div class="login_containerregister">
             <label><b>Email</b></label>
-            <input type="email"
+            <input type="text"
                    placeholder="Voer uw email in"
                    name="email"
                    value="<?php echo $email ?>"
@@ -130,6 +130,6 @@
 
     <!-- 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>
+        <a href="https://myhyvesbookplus.nl/login.php" class="button">Login met een account</a>
     </div>
 </div>