Merge branch 'master' into kevin-prototype

2017-01-25 15:08:34 +01:00
parent 9ff256429d c23b8bd8e5
commit 95570c49d4
21 changed files with 253 additions and 54 deletions
--- a/website/queries/friendship.php
+++ b/website/queries/friendship.php
@@ -39,6 +39,21 @@ function selectAllFriendRequests() {
        SELECT
            `userID`,
            `username`,
+            CASE `status` IS NULL
+              WHEN TRUE THEN 0
+              WHEN FALSE THEN
+                CASE `status` = 'confirmed'
+                WHEN TRUE THEN
+                  1
+                WHEN FALSE THEN
+                  CASE `user1ID` = :userID
+                  WHEN TRUE THEN
+                    2
+                  WHEN FALSE THEN
+                    3
+                  END
+                END
+            END AS `friend_state`,
            LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 15) as `name`,
            IFNULL(
                `profilepicture`,