MyHyvesBookPlus/WebDB
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Merge branch 'lars' into 'master'

Browse Source 
Lars

See merge request !165
This commit was merged in pull request #169.
This commit is contained in:
Lars van Hijfte
2017-02-01 12:30:08 +01:00
parent fcd58857c0 6aee603a64
commit 8e81cec843
19 changed files with 334 additions and 273 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
website/queries/group_member.php
View File

@@ -1,7 +1,7 @@
<?php
function selectAllGroupsFromUser($userID) {
selectLimitedGroupsFromUser($userID, 9999);
return selectLimitedGroupsFromUser($userID, 9999);
}
function selectLimitedGroupsFromUser($userID, $limit) {

30
website/queries/user.php
View File

@@ -126,7 +126,11 @@ function select20UsersFromN($n) {
`userID`,
`username`,
`role`,
`bancomment`
`bancomment`,
CASE `lastactivity` >= DATE_SUB(NOW(),INTERVAL 15 MINUTE)
WHEN TRUE THEN 'online'
WHEN FALSE THEN 'offline'
END AS `onlinestatus`
FROM
`user`
ORDER BY
@@ -147,7 +151,11 @@ function search20UsersFromN($n, $keyword) {
`userID`,
`username`,
`role`,
`bancomment`
`bancomment`,
CASE `lastactivity` >= DATE_SUB(NOW(),INTERVAL 15 MINUTE)
WHEN TRUE THEN 'online'
WHEN FALSE THEN 'offline'
END AS `onlinestatus`
FROM
`user`
WHERE
@@ -171,7 +179,11 @@ function search20UsersFromNByStatus($n, $keyword, $status) {
`userID`,
`username`,
`role`,
`bancomment`
`bancomment`,
CASE `lastactivity` >= DATE_SUB(NOW(),INTERVAL 15 MINUTE)
WHEN TRUE THEN 'online'
WHEN FALSE THEN 'offline'
END AS `onlinestatus`
FROM
`user`
WHERE
@@ -199,7 +211,11 @@ function searchSomeUsersByStatus($n, $m, $keyword, $status) {
`userID`,
`username`,
`role`,
`bancomment`
`bancomment`,
CASE `lastactivity` >= DATE_SUB(NOW(),INTERVAL 15 MINUTE)
WHEN TRUE THEN 'online'
WHEN FALSE THEN 'offline'
END AS `onlinestatus`
FROM
`user`
WHERE
@@ -334,7 +350,11 @@ function searchSomeUsers($n, $m, $search) {
`profilepicture`,
'../img/avatar-standard.png'
) AS profilepicture,
LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 15) as `fullname`
LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 15) as `fullname`,
CASE `lastactivity` >= DATE_SUB(NOW(),INTERVAL 15 MINUTE)
WHEN TRUE THEN 'online'
WHEN FALSE THEN 'offline'
END AS `onlinestatus`
FROM
`user`
WHERE