Merge branch 'lars' into 'master'

Lars

See merge request !135

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;
+}

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 {

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,7 +59,8 @@ function sendMessage($destination, $content) {
 }
 
 function getNewChatMessages($lastID, $destination) {
-    if (getFriendshipStatus($user2ID) == 1) {
+    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`,

website/views/chat-view.php

@@ -74,6 +74,7 @@
                                name="content"
                                id="newContent"
                                placeholder="Schrijf een bericht..."
+                               autocomplete="off"
                                autofocus
                                required
                         />