From c8450f3cb37644a852f07017abda8787c06fae11 Mon Sep 17 00:00:00 2001
From: Lars van Hijfte <larsvanhijfte@hotmail.com>
Date: Mon, 30 Jan 2017 12:44:15 +0100
Subject: [PATCH] Changed profile buttons

---
 website/public/js/friendButtons.js  | 32 ++++++++++++++---------------
 website/public/js/main.js           |  6 +++---
 website/public/styles/profile.css   |  2 +-
 website/queries/private_message.php |  4 ++--
 website/views/profile.php           | 30 ++++++++++++++-------------
 5 files changed, 38 insertions(+), 36 deletions(-)

diff --git a/website/public/js/friendButtons.js b/website/public/js/friendButtons.js
index febc636..d62e919 100644
--- a/website/public/js/friendButtons.js
+++ b/website/public/js/friendButtons.js
@@ -23,14 +23,14 @@ function placeFriendButtons() {
                         icon1 = "fa-handshake-o";
                         break;
                     case "1":
-                        value1 = "delete";
-                        class1 = "red";
-                        text1 = "Verwijder";
-                        icon1 = "fa-times";
-                        value2 = userID;
-                        class2 = "green";
-                        text2 = "Chat";
-                        icon2 = "fa-comment-o";
+                        value1 = userID;
+                        class1 = "green";
+                        text1 = "Chat";
+                        icon1 = "fa-comment-o";
+                        value2 = "delete";
+                        class2 = "red";
+                        text2 = "Verwijder";
+                        icon2 = "fa-times";
                         break;
                     case "2":
                         value1 = "delete";
@@ -39,14 +39,14 @@ function placeFriendButtons() {
                         icon1 = "fa-cross";
                         break;
                     case "3":
-                        value1 = "delete";
-                        class1 = "red";
-                        text1 = "Weiger";
-                        icon1 = "fa-times";
-                        value2 = "accept";
-                        class2 = "green";
-                        text2 = "Accepteer";
-                        icon2 = "fa-check";
+                        value1 = "accept";
+                        class1 = "green";
+                        text1 = "Accepteer";
+                        icon1 = "fa-check";
+                        value2 = "delete";
+                        class2 = "red";
+                        text2 = "Weiger";
+                        icon2 = "fa-times";
                         break;
                     default:
                         console.log(friendshipStatus);
diff --git a/website/public/js/main.js b/website/public/js/main.js
index 45e4005..07a0cb8 100644
--- a/website/public/js/main.js
+++ b/website/public/js/main.js
@@ -5,14 +5,14 @@ function fancyText(text) {
     // Add images and gifs.
     var regex = /(https?:\/\/.[^ ]*)/ig;
     text = text.replace(regex, function(link) {
-        if (link.match(/(https:\/\/.[^ ]*\.(?:png|jpg|jpeg|gif))/ig)) {
+        if (link.match(/(https?:\/\/.[^ ]*\.(?:png|jpg|jpeg|gif))/ig)) {
             return "<img alt='" + link + "' src='" + link + "' />";
-        } else if (link.match(/(https:\/\/.[^ ]*\.(?:mp4))/ig)) {
+        } else if (link.match(/(https?:\/\/.[^ ]*\.(?:mp4))/ig)) {
             return "<video width='100%'>" +
                         "<source src='"+ link +"' type='video/mp4'>" +
                         "<b>Je browser ondersteund geen video</b>" +
                 "</video><button onclick='$(this).prev().get(0).play();'>Speel af</button>";
-        } else if (link.match(/(https:\/\/.[^ ]*\.(?:ogg))/ig)) {
+        } else if (link.match(/(https?:\/\/.[^ ]*\.(?:ogg))/ig)) {
             return "<video width='100%'>" +
                 "<source src='"+ link +"' type='video/ogg'>" +
                 "<b>Je browser ondersteund geen video</b>" +
diff --git a/website/public/styles/profile.css b/website/public/styles/profile.css
index a85f683..2fe819a 100644
--- a/website/public/styles/profile.css
+++ b/website/public/styles/profile.css
@@ -51,7 +51,7 @@
     display: inline-block;
     width: 150px;
     height: 150px;
-    margin-bottom: -25px;
+    margin-bottom: -45px;
 }
 
 /* Old */
diff --git a/website/queries/private_message.php b/website/queries/private_message.php
index 4d48d3a..39533f3 100644
--- a/website/queries/private_message.php
+++ b/website/queries/private_message.php
@@ -15,7 +15,7 @@ function getOldChatMessages($user2ID) {
             `origin` = :user2 AND
             `destination` = :user1
         ORDER BY
-            `messageID` ASC
+            `creationdate` ASC
         ");
 
         $stmt->bindParam(":user1", $user1ID);
@@ -74,7 +74,7 @@ function getNewChatMessages($lastID, $destination) {
             `destination` = :user1) AND
             `messageID` > :lastID
         ORDER BY
-            `messageID` ASC
+            `creationdate` ASC
         ");
 
         $stmt->bindParam(':user1', $_SESSION["userID"]);
diff --git a/website/views/profile.php b/website/views/profile.php
index 9e90f61..a80f415 100644
--- a/website/views/profile.php
+++ b/website/views/profile.php
@@ -1,20 +1,22 @@
 <div class="content">
     <div class="user-box">
         <img class="profile-picture main-picture" src="<?= $user["profilepicture"] ?>"><br />
-        <div class="status-buttons-container">
-            <button disabled class="gray"><?= $user["onlinestatus"] ?></button>
-            <button disabled class="gray"><?= $user["role"] ?></button>
-        </div>
-        <div class="friend-button-container">
-            <p>:)</p>
-            <p>Je ziet er goed uit vandaag</p>
-        </div>
-        <div class="profile-info platform">
-            <h2><?= $user["fname"]?> <?=$user["lname"]?></h2>
-            <h5><?=$user["username"]?></h5>
-            <?php if (strlen($user["bio"]) <= 50) {
-                echo "<p>" . $user["bio"] . "</p>";
-            } ?>
+        <div class="platform">
+            <div class="status-buttons-container">
+                <button disabled class="gray"><?= $user["onlinestatus"] ?></button>
+                <button disabled class="gray"><?= $user["role"] ?></button>
+            </div>
+            <div class="friend-button-container">
+                <p>:)</p>
+                <p>Je ziet er goed uit vandaag</p>
+            </div>
+            <div class="profile-info">
+                <h2><?= $user["fname"]?> <?=$user["lname"]?></h2>
+                <h5><?=$user["username"]?></h5>
+                <?php if (strlen($user["bio"]) <= 50) {
+                    echo "<p>" . $user["bio"] . "</p>";
+                } ?>
+            </div>
         </div>
     </div>
     <?php if (strlen($user["bio"]) > 50) {