diff options
| author | Philip Häusler <msquare@notrademark.de> | 2014-12-25 22:32:18 +0100 |
|---|---|---|
| committer | Philip Häusler <msquare@notrademark.de> | 2014-12-25 22:32:18 +0100 |
| commit | e89acc0c1d1188662da7490e3a75a4a5c3950a75 (patch) | |
| tree | f646260cc23195008f6ca5152426b17641fc4f69 /includes/pages/admin_free.php | |
| parent | bcd33c02c814a8d82c08c078c8fae287d1cd95a5 (diff) | |
| parent | 544a51612f14c4f3cf7d1c4a6de26a99ea94b788 (diff) | |
merge feature-shift-types
Diffstat (limited to 'includes/pages/admin_free.php')
| -rw-r--r-- | includes/pages/admin_free.php | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/includes/pages/admin_free.php b/includes/pages/admin_free.php index 13d4f795..b56da4d1 100644 --- a/includes/pages/admin_free.php +++ b/includes/pages/admin_free.php @@ -27,7 +27,15 @@ function admin_free() { foreach ($angel_types_source as $angel_type) $angel_types[$angel_type['id']] = $angel_type['name']; - $users = sql_select("SELECT `User`.* FROM `User` ${angeltypesearch} LEFT JOIN `ShiftEntry` ON `User`.`UID` = `ShiftEntry`.`UID` LEFT JOIN `Shifts` ON (`ShiftEntry`.`SID` = `Shifts`.`SID` AND `Shifts`.`start` < " . sql_escape(time()) . " AND `Shifts`.`end` > " . sql_escape(time()) . ") WHERE `User`.`Gekommen` = 1 AND `Shifts`.`SID` IS NULL GROUP BY `User`.`UID` ORDER BY `Nick`"); + $users = sql_select(" + SELECT `User`.* + FROM `User` + ${angeltypesearch} + LEFT JOIN `ShiftEntry` ON `User`.`UID` = `ShiftEntry`.`UID` + LEFT JOIN `Shifts` ON (`ShiftEntry`.`SID` = `Shifts`.`SID` AND `Shifts`.`start` < " . sql_escape(time()) . " AND `Shifts`.`end` > " . sql_escape(time()) . ") + WHERE `User`.`Gekommen` = 1 AND `Shifts`.`SID` IS NULL + GROUP BY `User`.`UID` + ORDER BY `Nick`"); $free_users_table = array(); if ($search == "") |