Merge branch 'master' into kevin-prototype

2017-01-31 12:06:58 +01:00
parent dee483e946 03481f5888
commit 2e71942fdf
20 changed files with 250 additions and 76 deletions
--- a/website/queries/user.php
+++ b/website/queries/user.php
@@ -45,7 +45,10 @@ function selectUser($me, $other) {
            ) AS profilepicture,
          `bio`,
          `user`.`creationdate`,
-          `onlinestatus`,
+          CASE `lastactivity` >= DATE_SUB(NOW(),INTERVAL 15 MINUTE)
+            WHEN TRUE THEN 'online'
+            WHEN FALSE THEN 'offline'
+          END AS `onlinestatus`,
          `role`,
          `fname`,
          `lname`,