From 032e25b044c11d0018dfb506de4a9d3d21496f05 Mon Sep 17 00:00:00 2001
From: Lars van Hijfte <larsvanhijfte@hotmail.com>
Date: Thu, 26 Jan 2017 21:50:47 +0100
Subject: [PATCH 1/3] You can now only chat with friends

---
 website/public/API/sendMessage.php  | 1 +
 website/queries/private_message.php | 2 +-
 website/views/chat-view.php         | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/website/public/API/sendMessage.php b/website/public/API/sendMessage.php
index c5d47d1..f84cb11 100644
--- a/website/public/API/sendMessage.php
+++ b/website/public/API/sendMessage.php
@@ -3,6 +3,7 @@
 session_start();
 require_once("../../queries/connect.php");
 require_once("../../queries/private_message.php");
+require_once("../../queries/friendship.php");
 require_once("../../queries/checkInput.php");
 
 if (!empty(test_input($_POST["destination"])) &&
diff --git a/website/queries/private_message.php b/website/queries/private_message.php
index d2b1537..369ee40 100644
--- a/website/queries/private_message.php
+++ b/website/queries/private_message.php
@@ -58,7 +58,7 @@ function sendMessage($destination, $content) {
 }
 
 function getNewChatMessages($lastID, $destination) {
-    if (getFriendshipStatus($user2ID) == 1) {
+    if (getFriendshipStatus($destination) == 1) {
         $stmt = $GLOBALS["db"]->prepare("
         SELECT
             *
diff --git a/website/views/chat-view.php b/website/views/chat-view.php
index 0d90149..974b441 100644
--- a/website/views/chat-view.php
+++ b/website/views/chat-view.php
@@ -74,6 +74,7 @@
                                name="content"
                                id="newContent"
                                placeholder="Schrijf een bericht..."
+                               autocomplete="off"
                                autofocus
                                required
                         />

From d89e672990325f96c060f3cbb74854eed4519289 Mon Sep 17 00:00:00 2001
From: Lars van Hijfte <larsvanhijfte@hotmail.com>
Date: Thu, 26 Jan 2017 21:54:47 +0100
Subject: [PATCH 2/3] Also fixed unread chat

---
 website/public/API/sendMessage.php  | 1 -
 website/queries/private_message.php | 6 ++++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/website/public/API/sendMessage.php b/website/public/API/sendMessage.php
index f84cb11..c5d47d1 100644
--- a/website/public/API/sendMessage.php
+++ b/website/public/API/sendMessage.php
@@ -3,7 +3,6 @@
 session_start();
 require_once("../../queries/connect.php");
 require_once("../../queries/private_message.php");
-require_once("../../queries/friendship.php");
 require_once("../../queries/checkInput.php");
 
 if (!empty(test_input($_POST["destination"])) &&
diff --git a/website/queries/private_message.php b/website/queries/private_message.php
index 369ee40..4d48d3a 100644
--- a/website/queries/private_message.php
+++ b/website/queries/private_message.php
@@ -30,6 +30,7 @@ function getOldChatMessages($user2ID) {
 }
 
 function sendMessage($destination, $content) {
+    require_once("friendship.php");
     if (getFriendshipStatus($destination) == 1) {
         $stmt = $GLOBALS["db"]->prepare("
         INSERT INTO
@@ -58,6 +59,7 @@ function sendMessage($destination, $content) {
 }
 
 function getNewChatMessages($lastID, $destination) {
+    require_once("friendship.php");
     if (getFriendshipStatus($destination) == 1) {
         $stmt = $GLOBALS["db"]->prepare("
         SELECT
@@ -91,13 +93,13 @@ function getNewChatMessages($lastID, $destination) {
 function selectAllUnreadChat() {
     $stmt = $GLOBALS["db"]->prepare("
     SELECT
-      LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 15) as `fullname`,
+      LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 15) AS `fullname`,
       `user`.`userID`,
       IFNULL(
           `profilepicture`,
           '../img/avatar-standard.png'
       ) AS profilepicture,
-      LEFT(`private_message`.`content`, 15) as `content`
+      LEFT(`private_message`.`content`, 15) AS `content`
     FROM
       `private_message`,
       `friendship`,

From f1bfc89e6afafc61456c4652fade6f197ebd6a26 Mon Sep 17 00:00:00 2001
From: Lars van Hijfte <larsvanhijfte@hotmail.com>
Date: Thu, 26 Jan 2017 22:33:32 +0100
Subject: [PATCH 3/3] Custom scrollbar

---
 website/public/styles/main.css    | 13 +++++++++++++
 website/public/styles/profile.css |  1 +
 2 files changed, 14 insertions(+)

diff --git a/website/public/styles/main.css b/website/public/styles/main.css
index abda8be..0c37afa 100644
--- a/website/public/styles/main.css
+++ b/website/public/styles/main.css
@@ -275,3 +275,16 @@ div[data-title]:hover:after {
     display: inline-block;
     vertical-align: middle;
 }
+
+::-webkit-scrollbar {
+    width: 5px;
+    height: 5px;
+}
+::-webkit-scrollbar-track {
+    background: none;
+}
+::-webkit-scrollbar-thumb {
+    -webkit-border-radius: 20px;
+    border-radius: 20px;
+    background: #4CAF50;
+}
\ No newline at end of file
diff --git a/website/public/styles/profile.css b/website/public/styles/profile.css
index 85b2db5..becbeca 100644
--- a/website/public/styles/profile.css
+++ b/website/public/styles/profile.css
@@ -30,6 +30,7 @@ div.posts div.post {
     width: calc(100% - 40px);
     cursor: pointer;
     transition-duration: 250ms;
+    word-wrap: break-word;
 }
 
 div.posts div.post:hover {