From 3de0cc840f45e53a9135f4faa44a375a7b0148ef Mon Sep 17 00:00:00 2001 From: Bot Date: Sun, 22 Jan 2017 01:02:52 +0100 Subject: Removed spaces --- includes/pages/admin_active.php | 7 +++---- includes/pages/admin_free.php | 10 +++++----- includes/pages/admin_news.php | 2 +- includes/pages/admin_questions.php | 3 +-- includes/pages/admin_user.php | 2 +- includes/pages/user_atom.php | 2 +- includes/pages/user_myshifts.php | 4 ++-- 7 files changed, 14 insertions(+), 16 deletions(-) (limited to 'includes/pages') diff --git a/includes/pages/admin_active.php b/includes/pages/admin_active.php index 8cb66e6e..d21afabe 100644 --- a/includes/pages/admin_active.php +++ b/includes/pages/admin_active.php @@ -53,8 +53,7 @@ function admin_active() } if (isset($_REQUEST['ack'])) { DB::update('UPDATE `User` SET `Aktiv` = 0 WHERE `Tshirt` = 0'); - $users = DB::select(sprintf( - ' + $users = DB::select(sprintf(' SELECT `User`.*, COUNT(`ShiftEntry`.`id`) AS `shift_count`, @@ -137,11 +136,11 @@ function admin_active() `User`.*, COUNT(`ShiftEntry`.`id`) AS `shift_count`, %s AS `shift_length` - FROM `User` LEFT JOIN `ShiftEntry` ON `User`.`UID` = `ShiftEntry`.`UID` + FROM `User` LEFT JOIN `ShiftEntry` ON `User`.`UID` = `ShiftEntry`.`UID` LEFT JOIN `Shifts` ON `ShiftEntry`.`SID` = `Shifts`.`SID` ' . ($show_all_shifts ? '' : 'AND (`Shifts`.`end` < ' . time() . " OR `Shifts`.`end` IS NULL)") . ' WHERE `User`.`Gekommen` = 1 - GROUP BY `User`.`UID` + GROUP BY `User`.`UID` ORDER BY `force_active` DESC, `shift_length` DESC %s ', diff --git a/includes/pages/admin_free.php b/includes/pages/admin_free.php index 630603ba..daaead22 100644 --- a/includes/pages/admin_free.php +++ b/includes/pages/admin_free.php @@ -44,10 +44,10 @@ function admin_free() } $users = DB::select(' - SELECT `User`.* - FROM `User` + SELECT `User`.* + FROM `User` ' . $angelTypeSearch . ' - LEFT JOIN `ShiftEntry` ON `User`.`UID` = `ShiftEntry`.`UID` + LEFT JOIN `ShiftEntry` ON `User`.`UID` = `ShiftEntry`.`UID` LEFT JOIN `Shifts` ON ( `ShiftEntry`.`SID` = `Shifts`.`SID` @@ -55,8 +55,8 @@ function admin_free() AND `Shifts`.`end` > ? ) WHERE `User`.`Gekommen` = 1 - AND `Shifts`.`SID` IS NULL - GROUP BY `User`.`UID` + AND `Shifts`.`SID` IS NULL + GROUP BY `User`.`UID` ORDER BY `Nick` ', [ diff --git a/includes/pages/admin_news.php b/includes/pages/admin_news.php index a814bc33..bc242831 100644 --- a/includes/pages/admin_news.php +++ b/includes/pages/admin_news.php @@ -46,7 +46,7 @@ function admin_news() case 'save': DB::update(' - UPDATE `News` SET + UPDATE `News` SET `Datum`=?, `Betreff`=?, `Text`=?, diff --git a/includes/pages/admin_questions.php b/includes/pages/admin_questions.php index 4c84e4f8..098701e3 100644 --- a/includes/pages/admin_questions.php +++ b/includes/pages/admin_questions.php @@ -116,8 +116,7 @@ function admin_questions() )); if ($answer != '') { - DB::update( - ' + DB::update(' UPDATE `Questions` SET `AID`=?, `Answer`=? WHERE `QID`=? diff --git a/includes/pages/admin_user.php b/includes/pages/admin_user.php index 2ab40cca..60349676 100644 --- a/includes/pages/admin_user.php +++ b/includes/pages/admin_user.php @@ -247,7 +247,7 @@ function admin_user() $force_active = $_REQUEST['force_active']; } $sql = ' - UPDATE `User` SET + UPDATE `User` SET `Nick` = ?, `Name` = ?, `Vorname` = ?, diff --git a/includes/pages/user_atom.php b/includes/pages/user_atom.php index 5574e8eb..d7c77d52 100644 --- a/includes/pages/user_atom.php +++ b/includes/pages/user_atom.php @@ -24,7 +24,7 @@ function user_atom() $news = DB::select(' SELECT * - FROM `News` + FROM `News` ' . (empty($_REQUEST['meetings']) ? '' : 'WHERE `Treffen` = 1 ') . ' ORDER BY `ID` DESC LIMIT ' . (int)config('display_news') diff --git a/includes/pages/user_myshifts.php b/includes/pages/user_myshifts.php index 62d87d27..6048093a 100644 --- a/includes/pages/user_myshifts.php +++ b/includes/pages/user_myshifts.php @@ -132,8 +132,8 @@ function user_myshifts() $user_id = $_REQUEST['cancel']; $shift = DB::select(' SELECT * - FROM `Shifts` - INNER JOIN `ShiftEntry` USING (`SID`) + FROM `Shifts` + INNER JOIN `ShiftEntry` USING (`SID`) WHERE `ShiftEntry`.`id`=? AND `UID`=? ', [ -- cgit v1.2.3-70-g09d2