Replaced " with '

22 files changed, 827 insertions, 682 deletions

diff --git a/includes/pages/admin_active.php b/includes/pages/admin_active.php
index 34b9eb14..c4b6e119 100644
--- a/includes/pages/admin_active.php
+++ b/includes/pages/admin_active.php
@@ -5,7 +5,7 @@
  */
 function admin_active_title()
 {
-    return _("Active angels");
+    return _('Active angels');
 }
 
 /**
@@ -15,12 +15,12 @@ function admin_active()
 {
     global $tshirt_sizes, $shift_sum_formula;
 
-    $msg = "";
-    $search = "";
-    $forced_count = sql_num_query("SELECT * FROM `User` WHERE `force_active`=1");
+    $msg = '';
+    $search = '';
+    $forced_count = sql_num_query('SELECT * FROM `User` WHERE `force_active`=1');
     $count = $forced_count;
-    $limit = "";
-    $set_active = "";
+    $limit = '';
+    $set_active = '';
 
     if (isset($_REQUEST['search'])) {
         $search = strip_request_item('search');
@@ -31,87 +31,92 @@ function admin_active()
     if (isset($_REQUEST['set_active'])) {
         $valid = true;
 
-        if (isset($_REQUEST['count']) && preg_match("/^[0-9]+$/", $_REQUEST['count'])) {
+        if (isset($_REQUEST['count']) && preg_match('/^[0-9]+$/', $_REQUEST['count'])) {
             $count = strip_request_item('count');
             if ($count < $forced_count) {
                 error(sprintf(
-                    _("At least %s angels are forced to be active. The number has to be greater."),
+                    _('At least %s angels are forced to be active. The number has to be greater.'),
                     $forced_count
                 ));
                 redirect(page_link_to('admin_active'));
             }
         } else {
             $valid = false;
-            $msg .= error(_("Please enter a number of angels to be marked as active."), true);
+            $msg .= error(_('Please enter a number of angels to be marked as active.'), true);
         }
 
         if ($valid) {
-            $limit = " LIMIT " . $count;
+            $limit = ' LIMIT ' . $count;
         }
         if (isset($_REQUEST['ack'])) {
-            sql_query("UPDATE `User` SET `Aktiv` = 0 WHERE `Tshirt` = 0");
+            sql_query('UPDATE `User` SET `Aktiv` = 0 WHERE `Tshirt` = 0');
             $users = sql_select("
-          SELECT `User`.*, COUNT(`ShiftEntry`.`id`) as `shift_count`, $shift_sum_formula as `shift_length` 
-          FROM `User` 
-          LEFT JOIN `ShiftEntry` ON `User`.`UID` = `ShiftEntry`.`UID` 
-          LEFT JOIN `Shifts` ON `ShiftEntry`.`SID` = `Shifts`.`SID` 
-          WHERE `User`.`Gekommen` = 1 AND `User`.`force_active`=0 
-          GROUP BY `User`.`UID` 
-          ORDER BY `force_active` DESC, `shift_length` DESC" . $limit);
+                  SELECT `User`.*, COUNT(`ShiftEntry`.`id`) as `shift_count`, $shift_sum_formula as `shift_length` 
+                  FROM `User` 
+                  LEFT JOIN `ShiftEntry` ON `User`.`UID` = `ShiftEntry`.`UID` 
+                  LEFT JOIN `Shifts` ON `ShiftEntry`.`SID` = `Shifts`.`SID` 
+                  WHERE `User`.`Gekommen` = 1 AND `User`.`force_active`=0 
+                  GROUP BY `User`.`UID` 
+                  ORDER BY `force_active` DESC, `shift_length` DESC" . $limit
+            );
             $user_nicks = [];
             foreach ($users as $usr) {
-                sql_query("UPDATE `User` SET `Aktiv` = 1 WHERE `UID`='" . sql_escape($usr['UID']) . "'");
+                sql_query('UPDATE `User` SET `Aktiv` = 1 WHERE `UID`=\'' . sql_escape($usr['UID']) . '\'');
                 $user_nicks[] = User_Nick_render($usr);
             }
-            sql_query("UPDATE `User` SET `Aktiv`=1 WHERE `force_active`=TRUE");
-            engelsystem_log("These angels are active now: " . join(", ", $user_nicks));
+            sql_query('UPDATE `User` SET `Aktiv`=1 WHERE `force_active`=TRUE');
+            engelsystem_log('These angels are active now: ' . join(', ', $user_nicks));
 
-            $limit = "";
-            $msg = success(_("Marked angels."), true);
+            $limit = '';
+            $msg = success(_('Marked angels.'), true);
         } else {
-            $set_active = '<a href="' . page_link_to('admin_active') . '&amp;serach=' . $search . '">&laquo; ' . _("back") . '</a> | <a href="' . page_link_to('admin_active') . '&amp;search=' . $search . '&amp;count=' . $count . '&amp;set_active&amp;ack">' . _("apply") . '</a>';
+            $set_active = '<a href="' . page_link_to('admin_active') . '&amp;serach=' . $search . '">&laquo; '
+                . _('back') . '</a> | <a href="'
+                . page_link_to('admin_active') . '&amp;search=' . $search . '&amp;count=' . $count . '&amp;set_active&amp;ack">'
+                . _('apply')
+                . '</a>';
         }
     }
 
-    if (isset($_REQUEST['active']) && preg_match("/^[0-9]+$/", $_REQUEST['active'])) {
+    if (isset($_REQUEST['active']) && preg_match('/^[0-9]+$/', $_REQUEST['active'])) {
         $user_id = $_REQUEST['active'];
         $user_source = User($user_id);
         if ($user_source != null) {
-            sql_query("UPDATE `User` SET `Aktiv`=1 WHERE `UID`='" . sql_escape($user_id) . "' LIMIT 1");
-            engelsystem_log("User " . User_Nick_render($user_source) . " is active now.");
-            $msg = success(_("Angel has been marked as active."), true);
+            sql_query('UPDATE `User` SET `Aktiv`=1 WHERE `UID`=\'' . sql_escape($user_id) . '\' LIMIT 1');
+            engelsystem_log('User ' . User_Nick_render($user_source) . ' is active now.');
+            $msg = success(_('Angel has been marked as active.'), true);
         } else {
-            $msg = error(_("Angel not found."), true);
+            $msg = error(_('Angel not found.'), true);
         }
-    } elseif (isset($_REQUEST['not_active']) && preg_match("/^[0-9]+$/", $_REQUEST['not_active'])) {
+    } elseif (isset($_REQUEST['not_active']) && preg_match('/^[0-9]+$/', $_REQUEST['not_active'])) {
         $user_id = $_REQUEST['not_active'];
         $user_source = User($user_id);
         if ($user_source != null) {
             sql_query("UPDATE `User` SET `Aktiv`=0 WHERE `UID`='" . sql_escape($user_id) . "' LIMIT 1");
-            engelsystem_log("User " . User_Nick_render($user_source) . " is NOT active now.");
-            $msg = success(_("Angel has been marked as not active."), true);
+            engelsystem_log('User ' . User_Nick_render($user_source) . ' is NOT active now.');
+            $msg = success(_('Angel has been marked as not active.'), true);
         } else {
-            $msg = error(_("Angel not found."), true);
+            $msg = error(_('Angel not found.'), true);
         }
-    } elseif (isset($_REQUEST['tshirt']) && preg_match("/^[0-9]+$/", $_REQUEST['tshirt'])) {
+    } elseif (isset($_REQUEST['tshirt']) && preg_match('/^[0-9]+$/', $_REQUEST['tshirt'])) {
         $user_id = $_REQUEST['tshirt'];
         $user_source = User($user_id);
         if ($user_source != null) {
             sql_query("UPDATE `User` SET `Tshirt`=1 WHERE `UID`='" . sql_escape($user_id) . "' LIMIT 1");
-            engelsystem_log("User " . User_Nick_render($user_source) . " has tshirt now.");
-            $msg = success(_("Angel has got a t-shirt."), true);
+            engelsystem_log('User ' . User_Nick_render($user_source) . ' has tshirt now.');
+            $msg = success(_('Angel has got a t-shirt.'), true);
         } else {
-            $msg = error("Angel not found.", true);
+            $msg = error('Angel not found.', true);
         }
-    } elseif (isset($_REQUEST['not_tshirt']) && preg_match("/^[0-9]+$/", $_REQUEST['not_tshirt'])) {
+    } elseif (isset($_REQUEST['not_tshirt']) && preg_match('/^[0-9]+$/', $_REQUEST['not_tshirt'])) {
         $user_id = $_REQUEST['not_tshirt'];
         $user_source = User($user_id);
         if ($user_source != null) {
             sql_query("UPDATE `User` SET `Tshirt`=0 WHERE `UID`='" . sql_escape($user_id) . "' LIMIT 1");
-            engelsystem_log("User " . User_Nick_render($user_source) . " has NO tshirt.");
-            $msg = success(_("Angel has got no t-shirt."), true);
+            engelsystem_log('User ' . User_Nick_render($user_source) . ' has NO tshirt.');
+            $msg = success(_('Angel has got no t-shirt.'), true);
         } else {
-            $msg = error(_("Angel not found."), true);
+            $msg = error(_('Angel not found.'), true);
         }
     }
 
@@ -121,16 +126,17 @@ function admin_active()
           COUNT(`ShiftEntry`.`id`) AS `shift_count`,
           ${shift_sum_formula} AS `shift_length`
       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)") . "
+      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` 
       ORDER BY `force_active` DESC, `shift_length` DESC" . $limit
     );
     $matched_users = [];
-    if ($search == "") {
+    if ($search == '') {
         $tokens = [];
     } else {
-        $tokens = explode(" ", $search);
+        $tokens = explode(' ', $search);
     }
     foreach ($users as &$usr) {
         if (count($tokens) > 0) {
@@ -154,14 +160,30 @@ function admin_active()
 
         $actions = [];
         if ($usr['Aktiv'] == 0) {
-            $actions[] = '<a href="' . page_link_to('admin_active') . '&amp;active=' . $usr['UID'] . ($show_all_shifts ? '&amp;show_all_shifts=' : '') . '&amp;search=' . $search . '">' . _("set active") . '</a>';
+            $actions[] = '<a href="'
+                . page_link_to('admin_active') . '&amp;active=' . $usr['UID']
+                . ($show_all_shifts ? '&amp;show_all_shifts=' : '') . '&amp;search=' . $search . '">'
+                . _('set active')
+                . '</a>';
         }
         if ($usr['Aktiv'] == 1 && $usr['Tshirt'] == 0) {
-            $actions[] = '<a href="' . page_link_to('admin_active') . '&amp;not_active=' . $usr['UID'] . ($show_all_shifts ? '&amp;show_all_shifts=' : '') . '&amp;search=' . $search . '">' . _("remove active") . '</a>';
-            $actions[] = '<a href="' . page_link_to('admin_active') . '&amp;tshirt=' . $usr['UID'] . ($show_all_shifts ? '&amp;show_all_shifts=' : '') . '&amp;search=' . $search . '">' . _("got t-shirt") . '</a>';
+            $actions[] = '<a href="'
+                . page_link_to('admin_active') . '&amp;not_active=' . $usr['UID']
+                . ($show_all_shifts ? '&amp;show_all_shifts=' : '') . '&amp;search=' . $search . '">'
+                . _('remove active')
+                . '</a>';
+            $actions[] = '<a href="'
+                . page_link_to('admin_active') . '&amp;tshirt=' . $usr['UID']
+                . ($show_all_shifts ? '&amp;show_all_shifts=' : '') . '&amp;search=' . $search . '">'
+                . _('got t-shirt')
+                . '</a>';
         }
         if ($usr['Tshirt'] == 1) {
-            $actions[] = '<a href="' . page_link_to('admin_active') . '&amp;not_tshirt=' . $usr['UID'] . ($show_all_shifts ? '&amp;show_all_shifts=' : '') . '&amp;search=' . $search . '">' . _("remove t-shirt") . '</a>';
+            $actions[] = '<a href="'
+                . page_link_to('admin_active') . '&amp;not_tshirt=' . $usr['UID']
+                . ($show_all_shifts ? '&amp;show_all_shifts=' : '') . '&amp;search=' . $search . '">'
+                . _('remove t-shirt')
+                . '</a>';
         }
 
         $usr['actions'] = join(' ', $actions);
@@ -174,43 +196,47 @@ function admin_active()
         if ($size != '') {
             $shirt_statistics[] = [
                 'size'   => $size,
-                'needed' => sql_select_single_cell("SELECT count(*) FROM `User` WHERE `Size`='" . sql_escape($size) . "' AND `Gekommen`=1"),
-                'given'  => sql_select_single_cell("SELECT count(*) FROM `User` WHERE `Size`='" . sql_escape($size) . "' AND `Tshirt`=1")
+                'needed' => sql_select_single_cell(
+                    "SELECT count(*) FROM `User` WHERE `Size`='" . sql_escape($size) . "' AND `Gekommen`=1"
+                ),
+                'given'  => sql_select_single_cell(
+                    "SELECT count(*) FROM `User` WHERE `Size`='" . sql_escape($size) . "' AND `Tshirt`=1"
+                )
             ];
         }
     }
     $shirt_statistics[] = [
-        'size'   => '<b>' . _("Sum") . '</b>',
+        'size'   => '<b>' . _('Sum') . '</b>',
         'needed' => '<b>' . User_arrived_count() . '</b>',
-        'given'  => '<b>' . sql_select_single_cell("SELECT count(*) FROM `User` WHERE `Tshirt`=1") . '</b>'
+        'given'  => '<b>' . sql_select_single_cell('SELECT count(*) FROM `User` WHERE `Tshirt`=1') . '</b>'
     ];
 
     return page_with_title(admin_active_title(), [
         form([
-            form_text('search', _("Search angel:"), $search),
-            form_checkbox('show_all_shifts', _("Show all shifts"), $show_all_shifts),
-            form_submit('submit', _("Search"))
+            form_text('search', _('Search angel:'), $search),
+            form_checkbox('show_all_shifts', _('Show all shifts'), $show_all_shifts),
+            form_submit('submit', _('Search'))
         ], page_link_to('admin_active')),
-        $set_active == "" ? form([
-            form_text('count', _("How much angels should be active?"), $count),
-            form_submit('set_active', _("Preview"))
+        $set_active == '' ? form([
+            form_text('count', _('How much angels should be active?'), $count),
+            form_submit('set_active', _('Preview'))
         ]) : $set_active,
         $msg . msg(),
         table([
-            'nick'         => _("Nickname"),
-            'shirt_size'   => _("Size"),
-            'shift_count'  => _("Shifts"),
-            'work_time'    => _("Length"),
-            'active'       => _("Active?"),
-            'force_active' => _("Forced"),
-            'tshirt'       => _("T-shirt?"),
-            'actions'      => ""
+            'nick'         => _('Nickname'),
+            'shirt_size'   => _('Size'),
+            'shift_count'  => _('Shifts'),
+            'work_time'    => _('Length'),
+            'active'       => _('Active?'),
+            'force_active' => _('Forced'),
+            'tshirt'       => _('T-shirt?'),
+            'actions'      => ''
         ], $matched_users),
-        '<h2>' . _("Shirt statistics") . '</h2>',
+        '<h2>' . _('Shirt statistics') . '</h2>',
         table([
-            'size'   => _("Size"),
-            'needed' => _("Needed shirts"),
-            'given'  => _("Given shirts")
+            'size'   => _('Size'),
+            'needed' => _('Needed shirts'),
+            'given'  => _('Given shirts')
         ], $shirt_statistics)
     ]);
 }
diff --git a/includes/pages/admin_arrive.php b/includes/pages/admin_arrive.php
index d0ed4ffc..a17408e7 100644
--- a/includes/pages/admin_arrive.php
+++ b/includes/pages/admin_arrive.php
@@ -5,7 +5,7 @@
  */
 function admin_arrive_title()
 {
-    return _("Arrived angels");
+    return _('Arrived angels');
 }
 
 /**
@@ -13,50 +13,60 @@ function admin_arrive_title()
  */
 function admin_arrive()
 {
-    $msg = "";
-    $search = "";
+    $msg = '';
+    $search = '';
     if (isset($_REQUEST['search'])) {
         $search = strip_request_item('search');
     }
 
-    if (isset($_REQUEST['reset']) && preg_match("/^[0-9]*$/", $_REQUEST['reset'])) {
+    if (isset($_REQUEST['reset']) && preg_match('/^[0-9]*$/', $_REQUEST['reset'])) {
         $user_id = $_REQUEST['reset'];
         $user_source = User($user_id);
         if ($user_source != null) {
-            sql_query("UPDATE `User` SET `Gekommen`=0, `arrival_date` = NULL WHERE `UID`='" . sql_escape($user_id) . "' LIMIT 1");
-            engelsystem_log("User set to not arrived: " . User_Nick_render($user_source));
-            success(_("Reset done. Angel has not arrived."));
+            sql_query("
+                UPDATE `User`
+                SET `Gekommen`=0, `arrival_date` = NULL
+                WHERE `UID`='" . sql_escape($user_id) . "'
+                LIMIT 1
+            ");
+            engelsystem_log('User set to not arrived: ' . User_Nick_render($user_source));
+            success(_('Reset done. Angel has not arrived.'));
             redirect(user_link($user_source));
         } else {
-            $msg = error(_("Angel not found."), true);
+            $msg = error(_('Angel not found.'), true);
         }
-    } elseif (isset($_REQUEST['arrived']) && preg_match("/^[0-9]*$/", $_REQUEST['arrived'])) {
+    } elseif (isset($_REQUEST['arrived']) && preg_match('/^[0-9]*$/', $_REQUEST['arrived'])) {
         $user_id = $_REQUEST['arrived'];
         $user_source = User($user_id);
         if ($user_source != null) {
-            sql_query("UPDATE `User` SET `Gekommen`=1, `arrival_date`='" . time() . "' WHERE `UID`='" . sql_escape($user_id) . "' LIMIT 1");
-            engelsystem_log("User set has arrived: " . User_Nick_render($user_source));
-            success(_("Angel has been marked as arrived."));
+            sql_query("
+                UPDATE `User`
+                SET `Gekommen`=1, `arrival_date`='" . time() . "'
+                WHERE `UID`='" . sql_escape($user_id) . "'
+                LIMIT 1
+            ");
+            engelsystem_log('User set has arrived: ' . User_Nick_render($user_source));
+            success(_('Angel has been marked as arrived.'));
             redirect(user_link($user_source));
         } else {
-            $msg = error(_("Angel not found."), true);
+            $msg = error(_('Angel not found.'), true);
         }
     }
 
-    $users = sql_select("SELECT * FROM `User` ORDER BY `Nick`");
+    $users = sql_select('SELECT * FROM `User` ORDER BY `Nick`');
     $arrival_count_at_day = [];
     $planned_arrival_count_at_day = [];
     $planned_departure_count_at_day = [];
     $users_matched = [];
-    if ($search == "") {
+    if ($search == '') {
         $tokens = [];
     } else {
-        $tokens = explode(" ", $search);
+        $tokens = explode(' ', $search);
     }
     foreach ($users as $usr) {
         if (count($tokens) > 0) {
             $match = false;
-            $index = join(" ", $usr);
+            $index = join(' ', $usr);
             foreach ($tokens as $t) {
                 if (stristr($index, trim($t))) {
                     $match = true;
@@ -75,9 +85,11 @@ function admin_arrive()
             $usr['rendered_planned_departure_date'] = '-';
         }
         $usr['rendered_planned_arrival_date'] = date('Y-m-d', $usr['planned_arrival_date']);
-        $usr['rendered_arrival_date'] = $usr['arrival_date'] > 0 ? date('Y-m-d', $usr['arrival_date']) : "-";
-        $usr['arrived'] = $usr['Gekommen'] == 1 ? _("yes") : "";
-        $usr['actions'] = $usr['Gekommen'] == 1 ? '<a href="' . page_link_to('admin_arrive') . '&reset=' . $usr['UID'] . '&search=' . $search . '">' . _("reset") . '</a>' : '<a href="' . page_link_to('admin_arrive') . '&arrived=' . $usr['UID'] . '&search=' . $search . '">' . _("arrived") . '</a>';
+        $usr['rendered_arrival_date'] = $usr['arrival_date'] > 0 ? date('Y-m-d', $usr['arrival_date']) : '-';
+        $usr['arrived'] = $usr['Gekommen'] == 1 ? _('yes') : '';
+        $usr['actions'] = $usr['Gekommen'] == 1
+            ? '<a href="' . page_link_to('admin_arrive') . '&reset=' . $usr['UID'] . '&search=' . $search . '">' . _('reset') . '</a>'
+            : '<a href="' . page_link_to('admin_arrive') . '&arrived=' . $usr['UID'] . '&search=' . $search . '">' . _('arrived') . '</a>';
 
         if ($usr['arrival_date'] > 0) {
             $day = date('Y-m-d', $usr['arrival_date']);
@@ -146,61 +158,61 @@ function admin_arrive()
     return page_with_title(admin_arrive_title(), [
         $msg . msg(),
         form([
-            form_text('search', _("Search"), $search),
-            form_submit('submit', _("Search"))
+            form_text('search', _('Search'), $search),
+            form_submit('submit', _('Search'))
         ]),
         table([
-            'nick'                            => _("Nickname"),
-            'rendered_planned_arrival_date'   => _("Planned arrival"),
-            'arrived'                         => _("Arrived?"),
-            'rendered_arrival_date'           => _("Arrival date"),
-            'rendered_planned_departure_date' => _("Planned departure"),
-            'actions'                         => ""
+            'nick'                            => _('Nickname'),
+            'rendered_planned_arrival_date'   => _('Planned arrival'),
+            'arrived'                         => _('Arrived?'),
+            'rendered_arrival_date'           => _('Arrival date'),
+            'rendered_planned_departure_date' => _('Planned departure'),
+            'actions'                         => ''
         ], $users_matched),
         div('row', [
             div('col-md-4', [
-                heading(_("Planned arrival statistics"), 2),
+                heading(_('Planned arrival statistics'), 2),
                 bargraph('planned_arrives', 'day', [
-                    'count' => _("arrived"),
-                    'sum'   => _("arrived sum")
+                    'count' => _('arrived'),
+                    'sum'   => _('arrived sum')
                 ], [
                     'count' => '#090',
                     'sum'   => '#888'
                 ], $planned_arrival_at_day),
                 table([
-                    'day'   => _("Date"),
-                    'count' => _("Count"),
-                    'sum'   => _("Sum")
+                    'day'   => _('Date'),
+                    'count' => _('Count'),
+                    'sum'   => _('Sum')
                 ], $planned_arrival_at_day)
             ]),
             div('col-md-4', [
-                heading(_("Arrival statistics"), 2),
+                heading(_('Arrival statistics'), 2),
                 bargraph('arrives', 'day', [
-                    'count' => _("arrived"),
-                    'sum'   => _("arrived sum")
+                    'count' => _('arrived'),
+                    'sum'   => _('arrived sum')
                 ], [
                     'count' => '#090',
                     'sum'   => '#888'
                 ], $arrival_at_day),
                 table([
-                    'day'   => _("Date"),
-                    'count' => _("Count"),
-                    'sum'   => _("Sum")
+                    'day'   => _('Date'),
+                    'count' => _('Count'),
+                    'sum'   => _('Sum')
                 ], $arrival_at_day)
             ]),
             div('col-md-4', [
-                heading(_("Planned departure statistics"), 2),
+                heading(_('Planned departure statistics'), 2),
                 bargraph('planned_departures', 'day', [
-                    'count' => _("arrived"),
-                    'sum'   => _("arrived sum")
+                    'count' => _('arrived'),
+                    'sum'   => _('arrived sum')
                 ], [
                     'count' => '#090',
                     'sum'   => '#888'
                 ], $planned_departure_at_day),
                 table([
-                    'day'   => _("Date"),
-                    'count' => _("Count"),
-                    'sum'   => _("Sum")
+                    'day'   => _('Date'),
+                    'count' => _('Count'),
+                    'sum'   => _('Sum')
                 ], $planned_departure_at_day)
             ])
         ])
diff --git a/includes/pages/admin_free.php b/includes/pages/admin_free.php
index 7d11c3a3..67d91006 100644
--- a/includes/pages/admin_free.php
+++ b/includes/pages/admin_free.php
@@ -5,7 +5,7 @@
  */
 function admin_free_title()
 {
-    return _("Free angels");
+    return _('Free angels');
 }
 
 /**
@@ -15,23 +15,24 @@ function admin_free()
 {
     global $privileges;
 
-    $search = "";
+    $search = '';
     if (isset($_REQUEST['search'])) {
         $search = strip_request_item('search');
     }
 
-    $angeltypesearch = "";
+    $angeltypesearch = '';
     if (empty($_REQUEST['angeltype'])) {
         $_REQUEST['angeltype'] = '';
     } else {
-        $angeltypesearch = " INNER JOIN `UserAngelTypes` ON (`UserAngelTypes`.`angeltype_id` = '" . sql_escape($_REQUEST['angeltype']) . "' AND `UserAngelTypes`.`user_id` = `User`.`UID`";
+        $angeltypesearch = ' INNER JOIN `UserAngelTypes` ON (`UserAngelTypes`.`angeltype_id` = \''
+            . sql_escape($_REQUEST['angeltype']) . "' AND `UserAngelTypes`.`user_id` = `User`.`UID`";
         if (isset($_REQUEST['confirmed_only'])) {
-            $angeltypesearch .= " AND `UserAngelTypes`.`confirm_user_id`";
+            $angeltypesearch .= ' AND `UserAngelTypes`.`confirm_user_id`';
         }
-        $angeltypesearch .= ") ";
+        $angeltypesearch .= ') ';
     }
 
-    $angel_types_source = sql_select("SELECT `id`, `name` FROM `AngelTypes` ORDER BY `name`");
+    $angel_types_source = sql_select('SELECT `id`, `name` FROM `AngelTypes` ORDER BY `name`');
     $angel_types = [
         '' => 'alle Typen'
     ];
@@ -44,21 +45,26 @@ function admin_free()
       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()) . "') 
+      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 = [];
-    if ($search == "") {
+    if ($search == '') {
         $tokens = [];
     } else {
-        $tokens = explode(" ", $search);
+        $tokens = explode(' ', $search);
     }
     foreach ($users as $usr) {
         if (count($tokens) > 0) {
             $match = false;
-            $index = join("", $usr);
+            $index = join('', $usr);
             foreach ($tokens as $t) {
                 if (stristr($index, trim($t))) {
                     $match = true;
@@ -78,7 +84,7 @@ function admin_free()
             'email'       => $usr['email_by_human_allowed'] ? $usr['email'] : glyph('eye-close'),
             'actions'     =>
                 in_array('admin_user', $privileges)
-                    ? button(page_link_to('admin_user') . '&amp;id=' . $usr['UID'], _("edit"), 'btn-xs')
+                    ? button(page_link_to('admin_user') . '&amp;id=' . $usr['UID'], _('edit'), 'btn-xs')
                     : ''
         ];
     }
@@ -86,25 +92,25 @@ function admin_free()
         form([
             div('row', [
                 div('col-md-4', [
-                    form_text('search', _("Search"), $search)
+                    form_text('search', _('Search'), $search)
                 ]),
                 div('col-md-4', [
-                    form_select('angeltype', _("Angeltype"), $angel_types, $_REQUEST['angeltype'])
+                    form_select('angeltype', _('Angeltype'), $angel_types, $_REQUEST['angeltype'])
                 ]),
                 div('col-md-2', [
-                    form_checkbox('confirmed_only', _("Only confirmed"), isset($_REQUEST['confirmed_only']))
+                    form_checkbox('confirmed_only', _('Only confirmed'), isset($_REQUEST['confirmed_only']))
                 ]),
                 div('col-md-2', [
-                    form_submit('submit', _("Search"))
+                    form_submit('submit', _('Search'))
                 ])
             ])
         ]),
         table([
-            'name'        => _("Nick"),
+            'name'        => _('Nick'),
             'shift_state' => '',
-            'dect'        => _("DECT"),
-            'jabber'      => _("Jabber"),
-            'email'       => _("E-Mail"),
+            'dect'        => _('DECT'),
+            'jabber'      => _('Jabber'),
+            'email'       => _('E-Mail'),
             'actions'     => ''
         ], $free_users_table)
     ]);
diff --git a/includes/pages/admin_groups.php b/includes/pages/admin_groups.php
index 7b97ca30..8e578cb2 100644
--- a/includes/pages/admin_groups.php
+++ b/includes/pages/admin_groups.php
@@ -5,7 +5,7 @@
  */
 function admin_groups_title()
 {
-    return _("Grouprights");
+    return _('Grouprights');
 }
 
 /**
@@ -13,9 +13,9 @@ function admin_groups_title()
  */
 function admin_groups()
 {
-    $html = "";
-    $groups = sql_select("SELECT * FROM `Groups` ORDER BY `Name`");
-    if (!isset($_REQUEST["action"])) {
+    $html = '';
+    $groups = sql_select('SELECT * FROM `Groups` ORDER BY `Name`');
+    if (!isset($_REQUEST['action'])) {
         $groups_table = [];
         foreach ($groups as $group) {
             $privileges = sql_select("
@@ -35,7 +35,7 @@ function admin_groups()
                 'privileges' => join(', ', $privileges_html),
                 'actions'    => button(
                     page_link_to('admin_groups') . '&action=edit&id=' . $group['UID'],
-                    _("edit"),
+                    _('edit'),
                     'btn-xs'
                 )
             ];
@@ -43,18 +43,18 @@ function admin_groups()
 
         return page_with_title(admin_groups_title(), [
             table([
-                'name'       => _("Name"),
-                'privileges' => _("Privileges"),
+                'name'       => _('Name'),
+                'privileges' => _('Privileges'),
                 'actions'    => ''
             ], $groups_table)
         ]);
     } else {
-        switch ($_REQUEST["action"]) {
+        switch ($_REQUEST['action']) {
             case 'edit':
-                if (isset($_REQUEST['id']) && preg_match("/^-[0-9]{1,11}$/", $_REQUEST['id'])) {
+                if (isset($_REQUEST['id']) && preg_match('/^-[0-9]{1,11}$/', $_REQUEST['id'])) {
                     $group_id = $_REQUEST['id'];
                 } else {
-                    return error("Incomplete call, missing Groups ID.", true);
+                    return error('Incomplete call, missing Groups ID.', true);
                 }
 
                 $group = sql_select("SELECT * FROM `Groups` WHERE `UID`='" . sql_escape($group_id) . "' LIMIT 1");
@@ -69,38 +69,38 @@ function admin_groups()
                             )
                         ORDER BY `Privileges`.`name`
                     ");
-                    $privileges_html = "";
+                    $privileges_html = '';
                     $privileges_form = [];
                     foreach ($privileges as $priv) {
                         $privileges_form[] = form_checkbox(
                             'privileges[]',
                             $priv['desc'] . ' (' . $priv['name'] . ')',
-                            $priv['group_id'] != "",
+                            $priv['group_id'] != '',
                             $priv['id']
                         );
                         $privileges_html .= sprintf(
                             '<tr><td><input type="checkbox" name="privileges[]" value="%s" %s /></td> <td>%s</td> <td>%s</td></tr>',
                             $priv['id'],
-                            ($priv['group_id'] != "" ? 'checked="checked"' : ''),
+                            ($priv['group_id'] != '' ? 'checked="checked"' : ''),
                             $priv['name'],
                             $priv['desc']
                         );
                     }
 
-                    $privileges_form[] = form_submit('submit', _("Save"));
-                    $html .= page_with_title(_("Edit group"), [
+                    $privileges_form[] = form_submit('submit', _('Save'));
+                    $html .= page_with_title(_('Edit group'), [
                         form($privileges_form, page_link_to('admin_groups') . '&action=save&id=' . $group_id)
                     ]);
                 } else {
-                    return error("No Group found.", true);
+                    return error('No Group found.', true);
                 }
                 break;
 
             case 'save':
-                if (isset($_REQUEST['id']) && preg_match("/^-[0-9]{1,11}$/", $_REQUEST['id'])) {
+                if (isset($_REQUEST['id']) && preg_match('/^-[0-9]{1,11}$/', $_REQUEST['id'])) {
                     $group_id = $_REQUEST['id'];
                 } else {
-                    return error("Incomplete call, missing Groups ID.", true);
+                    return error('Incomplete call, missing Groups ID.', true);
                 }
 
                 $group = sql_select("SELECT * FROM `Groups` WHERE `UID`='" . sql_escape($group_id) . "' LIMIT 1");
@@ -121,12 +121,12 @@ function admin_groups()
                         }
                     }
                     engelsystem_log(
-                        "Group privileges of group " . $group['Name']
-                        . " edited: " . join(", ", $privilege_names)
+                        'Group privileges of group ' . $group['Name']
+                        . ' edited: ' . join(', ', $privilege_names)
                     );
-                    redirect(page_link_to("admin_groups"));
+                    redirect(page_link_to('admin_groups'));
                 } else {
-                    return error("No Group found.", true);
+                    return error('No Group found.', true);
                 }
                 break;
         }
diff --git a/includes/pages/admin_import.php b/includes/pages/admin_import.php
index bef2b86e..2e37572f 100644
--- a/includes/pages/admin_import.php
+++ b/includes/pages/admin_import.php
@@ -5,7 +5,7 @@
  */
 function admin_import_title()
 {
-    return _("Frab import");
+    return _('Frab import');
 }
 
 /**
@@ -15,10 +15,10 @@ function admin_import()
 {
     global $rooms_import;
     global $user;
-    $html = "";
+    $html = '';
     $import_dir = __DIR__ . '/../../import';
 
-    $step = "input";
+    $step = 'input';
     if (
         isset($_REQUEST['step'])
         && in_array($step, [
@@ -69,14 +69,14 @@ function admin_import()
                     $add_minutes_start = trim($_REQUEST['add_minutes_start']);
                 } else {
                     $valid = false;
-                    error(_("Please enter an amount of minutes to add to a talk's begin."));
+                    error(_('Please enter an amount of minutes to add to a talk\'s begin.'));
                 }
 
                 if (isset($_REQUEST['add_minutes_end']) && is_numeric(trim($_REQUEST['add_minutes_end']))) {
                     $add_minutes_end = trim($_REQUEST['add_minutes_end']);
                 } else {
                     $valid = false;
-                    error(_("Please enter an amount of minutes to add to a talk's end."));
+                    error(_('Please enter an amount of minutes to add to a talk\'s end.'));
                 }
 
                 if (isset($_FILES['xcal_file']) && ($_FILES['xcal_file']['error'] == 0)) {
@@ -98,7 +98,12 @@ function admin_import()
             }
 
             if ($valid) {
-                redirect(page_link_to('admin_import') . "&step=check&shifttype_id=" . $shifttype_id . "&add_minutes_end=" . $add_minutes_end . "&add_minutes_start=" . $add_minutes_start);
+                redirect(
+                    page_link_to('admin_import')
+                    . '&step=check&shifttype_id=' . $shifttype_id
+                    . '&add_minutes_end=' . $add_minutes_end
+                    . '&add_minutes_start=' . $add_minutes_start
+                );
             } else {
                 $html .= div('well well-sm text-center', [
                         _('File Upload') . mute(glyph('arrow-right')) . mute(_('Validation')) . mute(glyph('arrow-right')) . mute(_('Import'))
@@ -107,13 +112,13 @@ function admin_import()
                             form([
                                 form_info(
                                     '',
-                                    _("This import will create/update/delete rooms and shifts by given FRAB-export file. The needed file format is xcal.")
+                                    _('This import will create/update/delete rooms and shifts by given FRAB-export file. The needed file format is xcal.')
                                 ),
                                 form_select('shifttype_id', _('Shifttype'), $shifttypes, $shifttype_id),
-                                form_spinner('add_minutes_start', _("Add minutes to start"), $add_minutes_start),
-                                form_spinner('add_minutes_end', _("Add minutes to end"), $add_minutes_end),
-                                form_file('xcal_file', _("xcal-File (.xcal)")),
-                                form_submit('submit', _("Import"))
+                                form_spinner('add_minutes_start', _('Add minutes to start'), $add_minutes_start),
+                                form_spinner('add_minutes_end', _('Add minutes to end'), $add_minutes_end),
+                                form_file('xcal_file', _('xcal-File (.xcal)')),
+                                form_submit('submit', _('Import'))
                             ])
                         ])
                     ]);
@@ -136,14 +141,14 @@ function admin_import()
             if (isset($_REQUEST['add_minutes_start']) && is_numeric(trim($_REQUEST['add_minutes_start']))) {
                 $add_minutes_start = trim($_REQUEST['add_minutes_start']);
             } else {
-                error(_("Please enter an amount of minutes to add to a talk's begin."));
+                error(_('Please enter an amount of minutes to add to a talk\'s begin.'));
                 redirect(page_link_to('admin_import'));
             }
 
             if (isset($_REQUEST['add_minutes_end']) && is_numeric(trim($_REQUEST['add_minutes_end']))) {
                 $add_minutes_end = trim($_REQUEST['add_minutes_end']);
             } else {
-                error(_("Please enter an amount of minutes to add to a talk's end."));
+                error(_('Please enter an amount of minutes to add to a talk\'s end.'));
                 redirect(page_link_to('admin_import'));
             }
 
@@ -158,53 +163,55 @@ function admin_import()
             $html .= div(
                     'well well-sm text-center',
                     [
-                        '<span class="text-success">' . _('File Upload') . glyph('ok-circle') . '</span>' . mute(glyph('arrow-right')) . _('Validation') . mute(glyph('arrow-right')) . mute(_('Import'))
-                    ])
+                        '<span class="text-success">' . _('File Upload') . glyph('ok-circle') . '</span>'
+                        . mute(glyph('arrow-right')) . _('Validation') . mute(glyph('arrow-right')) . mute(_('Import'))
+                    ]
+                )
                 . form(
                     [
                         div('row', [
                             div('col-sm-6', [
-                                '<h3>' . _("Rooms to create") . '</h3>',
-                                table(_("Name"), $rooms_new)
+                                '<h3>' . _('Rooms to create') . '</h3>',
+                                table(_('Name'), $rooms_new)
                             ]),
                             div('col-sm-6', [
-                                '<h3>' . _("Rooms to delete") . '</h3>',
-                                table(_("Name"), $rooms_deleted)
+                                '<h3>' . _('Rooms to delete') . '</h3>',
+                                table(_('Name'), $rooms_deleted)
                             ])
                         ]),
-                        '<h3>' . _("Shifts to create") . '</h3>',
+                        '<h3>' . _('Shifts to create') . '</h3>',
                         table([
-                            'day'       => _("Day"),
-                            'start'     => _("Start"),
-                            'end'       => _("End"),
+                            'day'       => _('Day'),
+                            'start'     => _('Start'),
+                            'end'       => _('End'),
                             'shifttype' => _('Shift type'),
-                            'title'     => _("Title"),
-                            'room'      => _("Room")
+                            'title'     => _('Title'),
+                            'room'      => _('Room')
                         ], shifts_printable($events_new, $shifttypes)),
-                        '<h3>' . _("Shifts to update") . '</h3>',
+                        '<h3>' . _('Shifts to update') . '</h3>',
                         table([
-                            'day'       => _("Day"),
-                            'start'     => _("Start"),
-                            'end'       => _("End"),
+                            'day'       => _('Day'),
+                            'start'     => _('Start'),
+                            'end'       => _('End'),
                             'shifttype' => _('Shift type'),
-                            'title'     => _("Title"),
-                            'room'      => _("Room")
+                            'title'     => _('Title'),
+                            'room'      => _('Room')
                         ], shifts_printable($events_updated, $shifttypes)),
-                        '<h3>' . _("Shifts to delete") . '</h3>',
+                        '<h3>' . _('Shifts to delete') . '</h3>',
                         table([
-                            'day'       => _("Day"),
-                            'start'     => _("Start"),
-                            'end'       => _("End"),
+                            'day'       => _('Day'),
+                            'start'     => _('Start'),
+                            'end'       => _('End'),
                             'shifttype' => _('Shift type'),
-                            'title'     => _("Title"),
-                            'room'      => _("Room")
+                            'title'     => _('Title'),
+                            'room'      => _('Room')
                         ], shifts_printable($events_deleted, $shifttypes)),
-                        form_submit('submit', _("Import"))
+                        form_submit('submit', _('Import'))
                     ],
                     page_link_to('admin_import')
                     . '&step=import&shifttype_id=' . $shifttype_id
-                    . "&add_minutes_end=" . $add_minutes_end
-                    . "&add_minutes_start=" . $add_minutes_start
+                    . '&add_minutes_end=' . $add_minutes_end
+                    . '&add_minutes_start=' . $add_minutes_start
                 );
             break;
 
@@ -228,14 +235,14 @@ function admin_import()
             if (isset($_REQUEST['add_minutes_start']) && is_numeric(trim($_REQUEST['add_minutes_start']))) {
                 $add_minutes_start = trim($_REQUEST['add_minutes_start']);
             } else {
-                error(_("Please enter an amount of minutes to add to a talk's begin."));
+                error(_('Please enter an amount of minutes to add to a talk\'s begin.'));
                 redirect(page_link_to('admin_import'));
             }
 
             if (isset($_REQUEST['add_minutes_end']) && is_numeric(trim($_REQUEST['add_minutes_end']))) {
                 $add_minutes_end = trim($_REQUEST['add_minutes_end']);
             } else {
-                error(_("Please enter an amount of minutes to add to a talk's end."));
+                error(_('Please enter an amount of minutes to add to a talk\'s end.'));
                 redirect(page_link_to('admin_import'));
             }
 
@@ -278,13 +285,17 @@ function admin_import()
                 }
             }
 
-            engelsystem_log("Frab import done");
+            engelsystem_log('Frab import done');
 
             unlink($import_file);
 
             $html .= div('well well-sm text-center', [
-                    '<span class="text-success">' . _('File Upload') . glyph('ok-circle') . '</span>' . mute(glyph('arrow-right')) . '<span class="text-success">' . _('Validation') . glyph('ok-circle') . '</span>' . mute(glyph('arrow-right')) . '<span class="text-success">' . _('Import') . glyph('ok-circle') . '</span>'
-                ]) . success(_("It's done!"), true);
+                    '<span class="text-success">' . _('File Upload') . glyph('ok-circle') . '</span>'
+                    . mute(glyph('arrow-right'))
+                    . '<span class="text-success">' . _('Validation') . glyph('ok-circle') . '</span>'
+                    . mute(glyph('arrow-right'))
+                    . '<span class="text-success">' . _('Import') . glyph('ok-circle') . '</span>'
+                ]) . success(_('It\'s done!'), true);
             break;
         default:
             redirect(page_link_to('admin_import'));
@@ -306,7 +317,7 @@ function prepare_rooms($file)
     $data = read_xml($file);
 
     // Load rooms from db for compare with input
-    $rooms = sql_select("SELECT * FROM `Room` WHERE `FromPentabarf`='Y'");
+    $rooms = sql_select('SELECT * FROM `Room` WHERE `FromPentabarf`=\'Y\'');
     $rooms_db = [];
     $rooms_import = [];
     foreach ($rooms as $room) {
@@ -345,7 +356,7 @@ function prepare_events($file, $shifttype_id, $add_minutes_start, $add_minutes_e
     global $rooms_import;
     $data = read_xml($file);
 
-    $rooms = sql_select("SELECT * FROM `Room`");
+    $rooms = sql_select('SELECT * FROM `Room`');
     $rooms_db = [];
     foreach ($rooms as $room) {
         $rooms_db[$room['Name']] = $room['RID'];
@@ -354,9 +365,8 @@ function prepare_events($file, $shifttype_id, $add_minutes_start, $add_minutes_e
     $events = $data->vcalendar->vevent;
     $shifts_pb = [];
     foreach ($events as $event) {
-        $event_pb = $event->children("http://pentabarf.org");
-        $event_id = trim($event_pb->{
-        'event-id'});
+        $event_pb = $event->children('http://pentabarf.org');
+        $event_id = trim($event_pb->{'event-id'});
         $shifts_pb[$event_id] = [
             'shifttype_id' => $shifttype_id,
             'start'        => parse_date("Ymd\THis", $event->dtstart) - $add_minutes_start * 60,
@@ -368,7 +378,7 @@ function prepare_events($file, $shifttype_id, $add_minutes_start, $add_minutes_e
         ];
     }
 
-    $shifts = sql_select("SELECT * FROM `Shifts` WHERE `PSID` IS NOT NULL ORDER BY `start`");
+    $shifts = sql_select('SELECT * FROM `Shifts` WHERE `PSID` IS NOT NULL ORDER BY `start`');
     $shifts_db = [];
     foreach ($shifts as $shift) {
         $shifts_db[$shift['PSID']] = $shift;
@@ -381,7 +391,14 @@ function prepare_events($file, $shifttype_id, $add_minutes_start, $add_minutes_e
             $shifts_new[] = $shift;
         } else {
             $tmp = $shifts_db[$shift['PSID']];
-            if ($shift['shifttype_id'] != $tmp['shifttype_id'] || $shift['title'] != $tmp['title'] || $shift['start'] != $tmp['start'] || $shift['end'] != $tmp['end'] || $shift['RID'] != $tmp['RID'] || $shift['URL'] != $tmp['URL']) {
+            if (
+                $shift['shifttype_id'] != $tmp['shifttype_id']
+                || $shift['title'] != $tmp['title']
+                || $shift['start'] != $tmp['start']
+                || $shift['end'] != $tmp['end']
+                || $shift['RID'] != $tmp['RID']
+                || $shift['URL'] != $tmp['URL']
+            ) {
                 $shifts_updated[] = $shift;
             }
         }
@@ -429,14 +446,14 @@ function shifts_printable($shifts, $shifttypes)
     $shifts_printable = [];
     foreach ($shifts as $shift) {
         $shifts_printable[] = [
-            'day'       => date("l, Y-m-d", $shift['start']),
-            'start'     => date("H:i", $shift['start']),
+            'day'       => date('l, Y-m-d', $shift['start']),
+            'start'     => date('H:i', $shift['start']),
             'shifttype' => ShiftType_name_render([
                 'id'   => $shift['shifttype_id'],
                 'name' => $shifttypes[$shift['shifttype_id']]
             ]),
             'title'     => shorten($shift['title']),
-            'end'       => date("H:i", $shift['end']),
+            'end'       => date('H:i', $shift['end']),
             'room'      => $rooms[$shift['RID']]
         ];
     }
diff --git a/includes/pages/admin_log.php b/includes/pages/admin_log.php
index 8a0b91ec..9e5e5827 100644
--- a/includes/pages/admin_log.php
+++ b/includes/pages/admin_log.php
@@ -5,7 +5,7 @@
  */
 function admin_log_title()
 {
-    return _("Log");
+    return _('Log');
 }
 
 /**
@@ -13,7 +13,7 @@ function admin_log_title()
  */
 function admin_log()
 {
-    $filter = "";
+    $filter = '';
     if (isset($_REQUEST['keyword'])) {
         $filter = strip_request_item('keyword');
     }
@@ -21,20 +21,20 @@ function admin_log()
 
     $log_entries = [];
     foreach ($log_entries_source as $log_entry) {
-        $log_entry['date'] = date("d.m.Y H:i", $log_entry['timestamp']);
+        $log_entry['date'] = date('d.m.Y H:i', $log_entry['timestamp']);
         $log_entries[] = $log_entry;
     }
 
     return page_with_title(admin_log_title(), [
         msg(),
         form([
-            form_text('keyword', _("Search"), $filter),
-            form_submit(_("Search"), "Go")
+            form_text('keyword', _('Search'), $filter),
+            form_submit(_('Search'), 'Go')
         ]),
         table([
-            'date'    => "Time",
-            'nick'    => "Angel",
-            'message' => "Log Entry"
+            'date'    => 'Time',
+            'nick'    => 'Angel',
+            'message' => 'Log Entry'
         ], $log_entries)
     ]);
 }
diff --git a/includes/pages/admin_news.php b/includes/pages/admin_news.php
index 68a1dbae..6d52bcf5 100644
--- a/includes/pages/admin_news.php
+++ b/includes/pages/admin_news.php
@@ -7,34 +7,34 @@ function admin_news()
 {
     global $user;
 
-    if (!isset($_GET["action"])) {
-        redirect(page_link_to("news"));
+    if (!isset($_GET['action'])) {
+        redirect(page_link_to('news'));
     }
 
     $html = '<div class="col-md-12"><h1>' . _("Edit news entry") . '</h1>' . msg();
     if (isset($_REQUEST['id']) && preg_match("/^[0-9]{1,11}$/", $_REQUEST['id'])) {
         $news_id = $_REQUEST['id'];
     } else {
-        return error("Incomplete call, missing News ID.", true);
+        return error('Incomplete call, missing News ID.', true);
     }
 
     $news = sql_select("SELECT * FROM `News` WHERE `ID`='" . sql_escape($news_id) . "' LIMIT 1");
     if (empty($news)) {
-        return error("No News found.", true);
+        return error('No News found.', true);
     }
 
-    switch ($_REQUEST["action"]) {
+    switch ($_REQUEST['action']) {
         case 'edit':
             list($news) = $news;
             $user_source = User($news['UID']);
 
             $html .= form([
-                form_info(_("Date"), date("Y-m-d H:i", $news['Datum'])),
-                form_info(_("Author"), User_Nick_render($user_source)),
-                form_text('eBetreff', _("Subject"), $news['Betreff']),
-                form_textarea('eText', _("Message"), $news['Text']),
-                form_checkbox('eTreffen', _("Meeting"), $news['Treffen'] == 1, 1),
-                form_submit('submit', _("Save"))
+                form_info(_('Date'), date('Y-m-d H:i', $news['Datum'])),
+                form_info(_('Author'), User_Nick_render($user_source)),
+                form_text('eBetreff', _('Subject'), $news['Betreff']),
+                form_textarea('eText', _('Message'), $news['Text']),
+                form_checkbox('eTreffen', _('Meeting'), $news['Treffen'] == 1, 1),
+                form_submit('submit', _('Save'))
             ], page_link_to('admin_news&action=save&id=' . $news_id));
 
             $html .= '<a class="btn btn-danger" href="' . page_link_to('admin_news&action=delete&id=' . $news_id) . '">'
@@ -50,17 +50,17 @@ function admin_news()
               `UID`='" . sql_escape($user['UID']) . "', 
               `Treffen`='" . sql_escape($_POST["eTreffen"]) . "' 
               WHERE `ID`='" . sql_escape($news_id) . "'");
-            engelsystem_log("News updated: " . $_POST["eBetreff"]);
-            success(_("News entry updated."));
-            redirect(page_link_to("news"));
+            engelsystem_log('News updated: ' . $_POST['eBetreff']);
+            success(_('News entry updated.'));
+            redirect(page_link_to('news'));
             break;
 
         case 'delete':
             list($news) = $news;
             sql_query("DELETE FROM `News` WHERE `ID`='" . sql_escape($news_id) . "' LIMIT 1");
-            engelsystem_log("News deleted: " . $news['Betreff']);
-            success(_("News entry deleted."));
-            redirect(page_link_to("news"));
+            engelsystem_log('News deleted: ' . $news['Betreff']);
+            success(_('News entry deleted.'));
+            redirect(page_link_to('news'));
             break;
         default:
             redirect(page_link_to('news'));
diff --git a/includes/pages/admin_questions.php b/includes/pages/admin_questions.php
index 032b010e..7dcb3057 100644
--- a/includes/pages/admin_questions.php
+++ b/includes/pages/admin_questions.php
@@ -5,7 +5,7 @@
  */
 function admin_questions_title()
 {
-    return _("Answer questions");
+    return _('Answer questions');
 }
 
 /**
@@ -17,9 +17,9 @@ function admin_new_questions()
 {
     global $privileges, $page;
 
-    if ($page != "admin_questions") {
-        if (in_array("admin_questions", $privileges)) {
-            $new_messages = sql_num_query("SELECT * FROM `Questions` WHERE `AID` IS NULL");
+    if ($page != 'admin_questions') {
+        if (in_array('admin_questions', $privileges)) {
+            $new_messages = sql_num_query('SELECT * FROM `Questions` WHERE `AID` IS NULL');
 
             if ($new_messages > 0) {
                 return '<a href="' . page_link_to("admin_questions") . '">' . _('There are unanswered questions!') . '</a>';
@@ -45,14 +45,14 @@ function admin_questions()
 
             $unanswered_questions_table[] = [
                 'from'     => User_Nick_render($user_source),
-                'question' => str_replace("\n", "<br />", $question['Question']),
+                'question' => str_replace("\n", '<br />', $question['Question']),
                 'answer'   => form([
                     form_textarea('answer', '', ''),
-                    form_submit('submit', _("Save"))
+                    form_submit('submit', _('Save'))
                 ], page_link_to('admin_questions') . '&action=answer&id=' . $question['QID']),
                 'actions'  => button(
-                    page_link_to("admin_questions") . '&action=delete&id=' . $question['QID'],
-                    _("delete"),
+                    page_link_to('admin_questions') . '&action=delete&id=' . $question['QID'],
+                    _('delete'),
                     'btn-xs'
                 )
             ];
@@ -65,41 +65,41 @@ function admin_questions()
             $answer_user_source = User($question['AID']);
             $answered_questions_table[] = [
                 'from'        => User_Nick_render($user_source),
-                'question'    => str_replace("\n", "<br />", $question['Question']),
+                'question'    => str_replace("\n", '<br />', $question['Question']),
                 'answered_by' => User_Nick_render($answer_user_source),
-                'answer'      => str_replace("\n", "<br />", $question['Answer']),
+                'answer'      => str_replace("\n", '<br />', $question['Answer']),
                 'actions'     => button(
-                    page_link_to("admin_questions") . '&action=delete&id=' . $question['QID'],
-                    _("delete"),
+                    page_link_to('admin_questions') . '&action=delete&id=' . $question['QID'],
+                    _('delete'),
                     'btn-xs'
                 )
             ];
         }
 
         return page_with_title(admin_questions_title(), [
-            '<h2>' . _("Unanswered questions") . '</h2>',
+            '<h2>' . _('Unanswered questions') . '</h2>',
             table([
-                'from'     => _("From"),
-                'question' => _("Question"),
-                'answer'   => _("Answer"),
+                'from'     => _('From'),
+                'question' => _('Question'),
+                'answer'   => _('Answer'),
                 'actions'  => ''
             ], $unanswered_questions_table),
-            '<h2>' . _("Answered questions") . '</h2>',
+            '<h2>' . _('Answered questions') . '</h2>',
             table([
-                'from'        => _("From"),
-                'question'    => _("Question"),
-                'answered_by' => _("Answered by"),
-                'answer'      => _("Answer"),
+                'from'        => _('From'),
+                'question'    => _('Question'),
+                'answered_by' => _('Answered by'),
+                'answer'      => _('Answer'),
                 'actions'     => ''
             ], $answered_questions_table)
         ]);
     } else {
         switch ($_REQUEST['action']) {
             case 'answer':
-                if (isset($_REQUEST['id']) && preg_match("/^[0-9]{1,11}$/", $_REQUEST['id'])) {
+                if (isset($_REQUEST['id']) && preg_match('/^[0-9]{1,11}$/', $_REQUEST['id'])) {
                     $question_id = $_REQUEST['id'];
                 } else {
-                    return error("Incomplete call, missing Question ID.", true);
+                    return error('Incomplete call, missing Question ID.', true);
                 }
 
                 $question = sql_select("SELECT * FROM `Questions` WHERE `QID`='" . sql_escape($question_id) . "' LIMIT 1");
@@ -110,36 +110,36 @@ function admin_questions()
                             strip_tags($_REQUEST['answer'])
                         ));
 
-                    if ($answer != "") {
+                    if ($answer != '') {
                         sql_query("
                             UPDATE `Questions`
                             SET `AID`='" . sql_escape($user['UID']) . "', `Answer`='" . sql_escape($answer) . "'
                             WHERE `QID`='" . sql_escape($question_id) . "'
                             LIMIT 1
                         ");
-                        engelsystem_log("Question " . $question[0]['Question'] . " answered: " . $answer);
-                        redirect(page_link_to("admin_questions"));
+                        engelsystem_log('Question ' . $question[0]['Question'] . ' answered: ' . $answer);
+                        redirect(page_link_to('admin_questions'));
                     } else {
-                        return error("Enter an answer!", true);
+                        return error('Enter an answer!', true);
                     }
                 } else {
-                    return error("No question found.", true);
+                    return error('No question found.', true);
                 }
                 break;
             case 'delete':
-                if (isset($_REQUEST['id']) && preg_match("/^[0-9]{1,11}$/", $_REQUEST['id'])) {
+                if (isset($_REQUEST['id']) && preg_match('/^[0-9]{1,11}$/', $_REQUEST['id'])) {
                     $question_id = $_REQUEST['id'];
                 } else {
-                    return error("Incomplete call, missing Question ID.", true);
+                    return error('Incomplete call, missing Question ID.', true);
                 }
 
                 $question = sql_select("SELECT * FROM `Questions` WHERE `QID`='" . sql_escape($question_id) . "' LIMIT 1");
                 if (count($question) > 0) {
                     sql_query("DELETE FROM `Questions` WHERE `QID`='" . sql_escape($question_id) . "' LIMIT 1");
-                    engelsystem_log("Question deleted: " . $question[0]['Question']);
-                    redirect(page_link_to("admin_questions"));
+                    engelsystem_log('Question deleted: ' . $question[0]['Question']);
+                    redirect(page_link_to('admin_questions'));
                 } else {
-                    return error("No question found.", true);
+                    return error('No question found.', true);
                 }
                 break;
         }
diff --git a/includes/pages/admin_rooms.php b/includes/pages/admin_rooms.php
index 9bd60bcc..9738f888 100644
--- a/includes/pages/admin_rooms.php
+++ b/includes/pages/admin_rooms.php
@@ -5,7 +5,7 @@
  */
 function admin_rooms_title()
 {
-    return _("Rooms");
+    return _('Rooms');
 }
 
 /**
@@ -13,7 +13,7 @@ function admin_rooms_title()
  */
 function admin_rooms()
 {
-    $rooms_source = sql_select("SELECT * FROM `Room` ORDER BY `Name`");
+    $rooms_source = sql_select('SELECT * FROM `Room` ORDER BY `Name`');
     $rooms = [];
     foreach ($rooms_source as $room) {
         $rooms[] = [
@@ -21,22 +21,22 @@ function admin_rooms()
             'from_pentabarf' => $room['FromPentabarf'] == 'Y' ? '&#10003;' : '',
             'public'         => $room['show'] == 'Y' ? '&#10003;' : '',
             'actions'        => table_buttons([
-                button(page_link_to('admin_rooms') . '&show=edit&id=' . $room['RID'], _("edit"), 'btn-xs'),
-                button(page_link_to('admin_rooms') . '&show=delete&id=' . $room['RID'], _("delete"), 'btn-xs')
+                button(page_link_to('admin_rooms') . '&show=edit&id=' . $room['RID'], _('edit'), 'btn-xs'),
+                button(page_link_to('admin_rooms') . '&show=delete&id=' . $room['RID'], _('delete'), 'btn-xs')
             ])
         ];
     }
     $room = null;
 
     if (isset($_REQUEST['show'])) {
-        $msg = "";
-        $name = "";
-        $from_pentabarf = "";
+        $msg = '';
+        $name = '';
+        $from_pentabarf = '';
         $public = 'Y';
-        $number = "";
+        $number = '';
         $room_id = 0;
 
-        $angeltypes_source = sql_select("SELECT * FROM `AngelTypes` ORDER BY `name`");
+        $angeltypes_source = sql_select('SELECT * FROM `AngelTypes` ORDER BY `name`');
         $angeltypes = [];
         $angeltypes_count = [];
         foreach ($angeltypes_source as $angeltype) {
@@ -47,7 +47,7 @@ function admin_rooms()
         if (test_request_int('id')) {
             $room = Room($_REQUEST['id']);
             if ($room === false) {
-                engelsystem_error("Unable to load room.");
+                engelsystem_error('Unable to load room.');
             }
             if ($room == null) {
                 redirect(page_link_to('admin_rooms'));
@@ -73,11 +73,11 @@ function admin_rooms()
                     $name = strip_request_item('name');
                     if (isset($room) && sql_num_query("SELECT * FROM `Room` WHERE `Name`='" . sql_escape($name) . "' AND NOT `RID`=" . sql_escape($room_id)) > 0) {
                         $valid = false;
-                        $msg .= error(_("This name is already in use."), true);
+                        $msg .= error(_('This name is already in use.'), true);
                     }
                 } else {
                     $valid = false;
-                    $msg .= error(_("Please enter a name."), true);
+                    $msg .= error(_('Please enter a name.'), true);
                 }
 
                 if (isset($_REQUEST['from_pentabarf'])) {
@@ -101,25 +101,45 @@ function admin_rooms()
                 foreach ($angeltypes as $angeltype_id => $angeltype) {
                     if (
                         isset($_REQUEST['angeltype_count_' . $angeltype_id])
-                        && preg_match("/^[0-9]{1,4}$/", $_REQUEST['angeltype_count_' . $angeltype_id])
+                        && preg_match('/^[0-9]{1,4}$/', $_REQUEST['angeltype_count_' . $angeltype_id])
                     ) {
                         $angeltypes_count[$angeltype_id] = $_REQUEST['angeltype_count_' . $angeltype_id];
                     } else {
                         $valid = false;
-                        $msg .= error(sprintf(_("Please enter needed angels for type %s."), $angeltype), true);
+                        $msg .= error(sprintf(_('Please enter needed angels for type %s.'), $angeltype), true);
                     }
                 }
 
                 if ($valid) {
                     if (isset($room_id)) {
-                        sql_query("UPDATE `Room` SET `Name`='" . sql_escape($name) . "', `FromPentabarf`='" . sql_escape($from_pentabarf) . "', `show`='" . sql_escape($public) . "', `Number`='" . sql_escape($number) . "' WHERE `RID`='" . sql_escape($room_id) . "' LIMIT 1");
-                        engelsystem_log("Room updated: " . $name . ", pentabarf import: " . $from_pentabarf . ", public: " . $public . ", number: " . $number);
+                        sql_query("
+                            UPDATE `Room`
+                            SET
+                                `Name`='" . sql_escape($name) . "',
+                                `FromPentabarf`='" . sql_escape($from_pentabarf) . "',
+                                `show`='" . sql_escape($public) . "',
+                                `Number`='" . sql_escape($number) . "'
+                            WHERE `RID`='" . sql_escape($room_id) . "'
+                            LIMIT 1
+                        ");
+                        engelsystem_log(
+                            'Room updated: ' . $name
+                            . ', pentabarf import: ' . $from_pentabarf
+                            . ', public: ' . $public
+                            . ', number: ' . $number
+                        );
                     } else {
                         $room_id = Room_create($name, $from_pentabarf, $public, $number);
                         if ($room_id === false) {
-                            engelsystem_error("Unable to create room.");
+                            engelsystem_error('Unable to create room.');
                         }
-                        engelsystem_log("Room created: " . $name . ", pentabarf import: " . $from_pentabarf . ", public: " . $public . ", number: " . $number);
+                        engelsystem_log(
+                            'Room created: ' . $name
+                            . ', pentabarf import: '
+                            . $from_pentabarf
+                            . ', public: ' . $public
+                            . ', number: ' . $number
+                        );
                     }
 
                     NeededAngelTypes_delete_by_room($room_id);
@@ -128,16 +148,16 @@ function admin_rooms()
                         $angeltype = AngelType($angeltype_id);
                         if ($angeltype != null) {
                             NeededAngelType_add(null, $angeltype_id, $room_id, $angeltype_count);
-                            $needed_angeltype_info[] = $angeltype['name'] . ": " . $angeltype_count;
+                            $needed_angeltype_info[] = $angeltype['name'] . ': ' . $angeltype_count;
                         }
                     }
 
                     engelsystem_log(
-                        "Set needed angeltypes of room " . $name
-                        . " to: " . join(", ", $needed_angeltype_info)
+                        'Set needed angeltypes of room ' . $name
+                        . ' to: ' . join(', ', $needed_angeltype_info)
                     );
-                    success(_("Room saved."));
-                    redirect(page_link_to("admin_rooms"));
+                    success(_('Room saved.'));
+                    redirect(page_link_to('admin_rooms'));
                 }
             }
             $angeltypes_count_form = [];
@@ -149,47 +169,47 @@ function admin_rooms()
 
             return page_with_title(admin_rooms_title(), [
                 buttons([
-                    button(page_link_to('admin_rooms'), _("back"), 'back')
+                    button(page_link_to('admin_rooms'), _('back'), 'back')
                 ]),
                 $msg,
                 form([
                     div('row', [
                         div('col-md-6', [
-                            form_text('name', _("Name"), $name),
-                            form_checkbox('from_pentabarf', _("Frab import"), $from_pentabarf),
-                            form_checkbox('public', _("Public"), $public),
-                            form_text('number', _("Room number"), $number)
+                            form_text('name', _('Name'), $name),
+                            form_checkbox('from_pentabarf', _('Frab import'), $from_pentabarf),
+                            form_checkbox('public', _('Public'), $public),
+                            form_text('number', _('Room number'), $number)
                         ]),
                         div('col-md-6', [
                             div('row', [
                                 div('col-md-12', [
-                                    form_info(_("Needed angels:"))
+                                    form_info(_('Needed angels:'))
                                 ]),
                                 join($angeltypes_count_form)
                             ])
                         ])
                     ]),
-                    form_submit('submit', _("Save"))
+                    form_submit('submit', _('Save'))
                 ])
             ]);
         } elseif ($_REQUEST['show'] == 'delete') {
             if (isset($_REQUEST['ack'])) {
                 if (!Room_delete($room_id)) {
-                    engelsystem_error("Unable to delete room.");
+                    engelsystem_error('Unable to delete room.');
                 }
 
-                engelsystem_log("Room deleted: " . $name);
-                success(sprintf(_("Room %s deleted."), $name));
+                engelsystem_log('Room deleted: ' . $name);
+                success(sprintf(_('Room %s deleted.'), $name));
                 redirect(page_link_to('admin_rooms'));
             }
 
             return page_with_title(admin_rooms_title(), [
                 buttons([
-                    button(page_link_to('admin_rooms'), _("back"), 'back')
+                    button(page_link_to('admin_rooms'), _('back'), 'back')
                 ]),
-                sprintf(_("Do you want to delete room %s?"), $name),
+                sprintf(_('Do you want to delete room %s?'), $name),
                 buttons([
-                    button(page_link_to('admin_rooms') . '&show=delete&id=' . $room_id . '&ack', _("Delete"), 'delete')
+                    button(page_link_to('admin_rooms') . '&show=delete&id=' . $room_id . '&ack', _('Delete'), 'delete')
                 ])
             ]);
         }
@@ -197,14 +217,14 @@ function admin_rooms()
 
     return page_with_title(admin_rooms_title(), [
         buttons([
-            button(page_link_to('admin_rooms') . '&show=edit', _("add"))
+            button(page_link_to('admin_rooms') . '&show=edit', _('add'))
         ]),
         msg(),
         table([
-            'name'           => _("Name"),
-            'from_pentabarf' => _("Frab import"),
-            'public'         => _("Public"),
-            'actions'        => ""
+            'name'           => _('Name'),
+            'from_pentabarf' => _('Frab import'),
+            'public'         => _('Public'),
+            'actions'        => ''
         ], $rooms)
     ]);
 }
diff --git a/includes/pages/admin_shifts.php b/includes/pages/admin_shifts.php
index d3bcea53..1e19c5e4 100644
--- a/includes/pages/admin_shifts.php
+++ b/includes/pages/admin_shifts.php
@@ -5,7 +5,7 @@
  */
 function admin_shifts_title()
 {
-    return _("Create shifts");
+    return _('Create shifts');
 }
 
 /**
@@ -17,24 +17,24 @@ function admin_shifts()
 {
     $valid = true;
 
-    $start = parse_date("Y-m-d H:i", date("Y-m-d") . " 00:00");
+    $start = parse_date('Y-m-d H:i', date('Y-m-d') . ' 00:00');
     $end = $start;
     $mode = 'single';
     $angelmode = 'manually';
     $length = '';
     $change_hours = [];
-    $title = "";
+    $title = '';
     $shifttype_id = null;
 
     // Locations laden (auch unsichtbare - fuer Erzengel ist das ok)
-    $rooms = sql_select("SELECT * FROM `Room` ORDER BY `Name`");
+    $rooms = sql_select('SELECT * FROM `Room` ORDER BY `Name`');
     $room_array = [];
     foreach ($rooms as $room) {
         $room_array[$room['RID']] = $room['Name'];
     }
 
     // Engeltypen laden
-    $types = sql_select("SELECT * FROM `AngelTypes` ORDER BY `name`");
+    $types = sql_select('SELECT * FROM `AngelTypes` ORDER BY `name`');
     $needed_angel_types = [];
     foreach ($types as $type) {
         $needed_angel_types[$type['id']] = 0;
@@ -73,7 +73,7 @@ function admin_shifts()
         // Auswahl der sichtbaren Locations für die Schichten
         if (
             isset($_REQUEST['rid'])
-            && preg_match("/^[0-9]+$/", $_REQUEST['rid'])
+            && preg_match('/^[0-9]+$/', $_REQUEST['rid'])
             && isset($room_array[$_REQUEST['rid']])
         ) {
             $rid = $_REQUEST['rid'];
@@ -83,14 +83,14 @@ function admin_shifts()
             error(_('Please select a location.'));
         }
 
-        if (isset($_REQUEST['start']) && $tmp = parse_date("Y-m-d H:i", $_REQUEST['start'])) {
+        if (isset($_REQUEST['start']) && $tmp = parse_date('Y-m-d H:i', $_REQUEST['start'])) {
             $start = $tmp;
         } else {
             $valid = false;
             error(_('Please select a start time.'));
         }
 
-        if (isset($_REQUEST['end']) && $tmp = parse_date("Y-m-d H:i", $_REQUEST['end'])) {
+        if (isset($_REQUEST['end']) && $tmp = parse_date('Y-m-d H:i', $_REQUEST['end'])) {
             $end = $tmp;
         } else {
             $valid = false;
@@ -106,7 +106,7 @@ function admin_shifts()
             if ($_REQUEST['mode'] == 'single') {
                 $mode = 'single';
             } elseif ($_REQUEST['mode'] == 'multi') {
-                if (isset($_REQUEST['length']) && preg_match("/^[0-9]+$/", trim($_REQUEST['length']))) {
+                if (isset($_REQUEST['length']) && preg_match('/^[0-9]+$/', trim($_REQUEST['length']))) {
                     $mode = 'multi';
                     $length = trim($_REQUEST['length']);
                 } else {
@@ -116,10 +116,10 @@ function admin_shifts()
             } elseif ($_REQUEST['mode'] == 'variable') {
                 if (
                     isset($_REQUEST['change_hours'])
-                    && preg_match("/^([0-9]{2}(,|$))/", trim(str_replace(" ", "", $_REQUEST['change_hours'])))
+                    && preg_match('/^([0-9]{2}(,|$))/', trim(str_replace(' ', '', $_REQUEST['change_hours'])))
                 ) {
                     $mode = 'variable';
-                    $change_hours = array_map('trim', explode(",", $_REQUEST['change_hours']));
+                    $change_hours = array_map('trim', explode(',', $_REQUEST['change_hours']));
                 } else {
                     $valid = false;
                     error(_('Please split the shift-change hours by colons.'));
@@ -138,7 +138,7 @@ function admin_shifts()
                 foreach ($types as $type) {
                     if (
                         isset($_REQUEST['type_' . $type['id']])
-                        && preg_match("/^[0-9]+$/", trim($_REQUEST['type_' . $type['id']]))
+                        && preg_match('/^[0-9]+$/', trim($_REQUEST['type_' . $type['id']]))
                     ) {
                         $needed_angel_types[$type['id']] = trim($_REQUEST['type_' . $type['id']]);
                     } else {
@@ -206,7 +206,7 @@ function admin_shifts()
                 } while ($shift_end < $end);
             } elseif ($mode == 'variable') {
                 rsort($change_hours);
-                $day = parse_date("Y-m-d H:i", date("Y-m-d", $start) . " 00:00");
+                $day = parse_date('Y-m-d H:i', date('Y-m-d', $start) . ' 00:00');
                 $change_index = 0;
                 // Ersten/nächsten passenden Schichtwechsel suchen
                 foreach ($change_hours as $i => $change_hour) {
@@ -223,7 +223,7 @@ function admin_shifts()
 
                 $shift_start = $start;
                 do {
-                    $day = parse_date("Y-m-d H:i", date("Y-m-d", $shift_start) . " 00:00");
+                    $day = parse_date('Y-m-d H:i', date('Y-m-d', $shift_start) . ' 00:00');
                     $shift_end = $day + $change_hours[$change_index] * 60 * 60;
 
                     if ($shift_end > $end) {
@@ -251,9 +251,9 @@ function admin_shifts()
                 $shifts_table_entry = [
                     'timeslot'      =>
                         '<span class="glyphicon glyphicon-time"></span> '
-                        . date("Y-m-d H:i", $shift['start'])
+                        . date('Y-m-d H:i', $shift['start'])
                         . ' - '
-                        . date("H:i", $shift['end'])
+                        . date('H:i', $shift['end'])
                         . '<br />'
                         . Room_name_render(Room($shift['RID'])),
                     'title'         =>
@@ -273,29 +273,29 @@ function admin_shifts()
             $_SESSION['admin_shifts_shifts'] = $shifts;
             $_SESSION['admin_shifts_types'] = $needed_angel_types;
 
-            $hidden_types = "";
+            $hidden_types = '';
             foreach ($needed_angel_types as $type_id => $count) {
                 $hidden_types .= form_hidden('type_' . $type_id, $count);
             }
-            return page_with_title(_("Preview"), [
+            return page_with_title(_('Preview'), [
                 form([
                     $hidden_types,
                     form_hidden('shifttype_id', $shifttype_id),
                     form_hidden('title', $title),
                     form_hidden('rid', $rid),
-                    form_hidden('start', date("Y-m-d H:i", $start)),
-                    form_hidden('end', date("Y-m-d H:i", $end)),
+                    form_hidden('start', date('Y-m-d H:i', $start)),
+                    form_hidden('end', date('Y-m-d H:i', $end)),
                     form_hidden('mode', $mode),
                     form_hidden('length', $length),
                     form_hidden('change_hours', implode(', ', $change_hours)),
                     form_hidden('angelmode', $angelmode),
-                    form_submit('back', _("back")),
+                    form_submit('back', _('back')),
                     table([
                         'timeslot'      => _('Time and location'),
                         'title'         => _('Type and title'),
                         'needed_angels' => _('Needed angels')
                     ], $shifts_table),
-                    form_submit('submit', _("Save"))
+                    form_submit('submit', _('Save'))
                 ])
             ]);
         }
@@ -314,10 +314,10 @@ function admin_shifts()
             }
 
             engelsystem_log(
-                "Shift created: " . $shifttypes[$shift['shifttype_id']]
-                . " with title " . $shift['title']
-                . " from " . date("Y-m-d H:i", $shift['start'])
-                . " to " . date("Y-m-d H:i", $shift['end'])
+                'Shift created: ' . $shifttypes[$shift['shifttype_id']]
+                . ' with title ' . $shift['title']
+                . ' from ' . date('Y-m-d H:i', $shift['start'])
+                . ' to ' . date('Y-m-d H:i', $shift['end'])
             );
 
             foreach ($_SESSION['admin_shifts_types'] as $type_id => $count) {
@@ -329,8 +329,8 @@ function admin_shifts()
             }
         }
 
-        engelsystem_log("Shift needs following angel types: " . join(", ", $needed_angel_types_info));
-        success("Schichten angelegt.");
+        engelsystem_log('Shift needs following angel types: ' . join(', ', $needed_angel_types_info));
+        success('Schichten angelegt.');
         redirect(page_link_to('admin_shifts'));
     } else {
         unset($_SESSION['admin_shifts_shifts']);
@@ -340,7 +340,7 @@ function admin_shifts()
     if (!isset($_REQUEST['rid'])) {
         $_REQUEST['rid'] = null;
     }
-    $angel_types = "";
+    $angel_types = '';
     foreach ($types as $type) {
         $angel_types .= '<div class="col-md-4">' . form_spinner(
                 'type_' . $type['id'],
@@ -354,43 +354,43 @@ function admin_shifts()
         msg(),
         form([
             form_select('shifttype_id', _('Shifttype'), $shifttypes, $shifttype_id),
-            form_text('title', _("Title"), $title),
-            form_select('rid', _("Room"), $room_array, $_REQUEST['rid']),
+            form_text('title', _('Title'), $title),
+            form_select('rid', _('Room'), $room_array, $_REQUEST['rid']),
             div('row', [
                 div('col-md-6', [
-                    form_text('start', _("Start"), date("Y-m-d H:i", $start)),
-                    form_text('end', _("End"), date("Y-m-d H:i", $end)),
-                    form_info(_("Mode"), ''),
-                    form_radio('mode', _("Create one shift"), $mode == 'single', 'single'),
-                    form_radio('mode', _("Create multiple shifts"), $mode == 'multi', 'multi'),
-                    form_text('length', _("Length"), !empty($_REQUEST['length']) ? $_REQUEST['length'] : '120'),
+                    form_text('start', _('Start'), date('Y-m-d H:i', $start)),
+                    form_text('end', _('End'), date('Y-m-d H:i', $end)),
+                    form_info(_('Mode'), ''),
+                    form_radio('mode', _('Create one shift'), $mode == 'single', 'single'),
+                    form_radio('mode', _('Create multiple shifts'), $mode == 'multi', 'multi'),
+                    form_text('length', _('Length'), !empty($_REQUEST['length']) ? $_REQUEST['length'] : '120'),
                     form_radio(
                         'mode',
-                        _("Create multiple shifts with variable length"),
+                        _('Create multiple shifts with variable length'),
                         $mode == 'variable',
                         'variable'
                     ),
                     form_text(
                         'change_hours',
-                        _("Shift change hours"),
+                        _('Shift change hours'),
                         !empty($_REQUEST['change_hours']) ? $_REQUEST['change_hours'] : '00, 04, 08, 10, 12, 14, 16, 18, 20, 22'
                     )
                 ]),
                 div('col-md-6', [
-                    form_info(_("Needed angels"), ''),
+                    form_info(_('Needed angels'), ''),
                     form_radio(
                         'angelmode',
-                        _("Take needed angels from room settings"),
+                        _('Take needed angels from room settings'),
                         $angelmode == 'location',
                         'location'
                     ),
-                    form_radio('angelmode', _("The following angels are needed"), $angelmode == 'manually', 'manually'),
+                    form_radio('angelmode', _('The following angels are needed'), $angelmode == 'manually', 'manually'),
                     div('row', [
                         $angel_types
                     ])
                 ])
             ]),
-            form_submit('preview', _("Preview"))
+            form_submit('preview', _('Preview'))
         ])
     ]);
 }
diff --git a/includes/pages/admin_user.php b/includes/pages/admin_user.php
index c6ce628f..ef0c9df8 100644
--- a/includes/pages/admin_user.php
+++ b/includes/pages/admin_user.php
@@ -5,7 +5,7 @@
  */
 function admin_user_title()
 {
-    return _("All Angels");
+    return _('All Angels');
 }
 
 /**
@@ -29,75 +29,80 @@ function admin_user()
             redirect(users_link());
         }
 
-        $html .= "Hallo,<br />" . "hier kannst du den Eintrag &auml;ndern. Unter dem Punkt 'Gekommen' " . "wird der Engel als anwesend markiert, ein Ja bei Aktiv bedeutet, " . "dass der Engel aktiv war und damit ein Anspruch auf ein T-Shirt hat. " . "Wenn T-Shirt ein 'Ja' enth&auml;lt, bedeutet dies, dass der Engel " . "bereits sein T-Shirt erhalten hat.<br /><br />\n";
-
-        $html .= "<form action=\"" . page_link_to("admin_user") . "&action=save&id=$user_id\" method=\"post\">\n";
-        $html .= "<table border=\"0\">\n";
-        $html .= "<input type=\"hidden\" name=\"Type\" value=\"Normal\">\n";
-        $html .= "<tr><td>\n";
-        $html .= "<table>\n";
-        $html .= "  <tr><td>Nick</td><td>" . "<input type=\"text\" size=\"40\" name=\"eNick\" value=\"" . $user_source['Nick'] . "\"></td></tr>\n";
-        $html .= "  <tr><td>lastLogIn</td><td>" . date("Y-m-d H:i", $user_source['lastLogIn']) . "</td></tr>\n";
-        $html .= "  <tr><td>Name</td><td>" . "<input type=\"text\" size=\"40\" name=\"eName\" value=\"" . $user_source['Name'] . "\"></td></tr>\n";
-        $html .= "  <tr><td>Vorname</td><td>" . "<input type=\"text\" size=\"40\" name=\"eVorname\" value=\"" . $user_source['Vorname'] . "\"></td></tr>\n";
-        $html .= "  <tr><td>Alter</td><td>" . "<input type=\"text\" size=\"5\" name=\"eAlter\" value=\"" . $user_source['Alter'] . "\"></td></tr>\n";
-        $html .= "  <tr><td>Telefon</td><td>" . "<input type=\"text\" size=\"40\" name=\"eTelefon\" value=\"" . $user_source['Telefon'] . "\"></td></tr>\n";
-        $html .= "  <tr><td>Handy</td><td>" . "<input type=\"text\" size=\"40\" name=\"eHandy\" value=\"" . $user_source['Handy'] . "\"></td></tr>\n";
-        $html .= "  <tr><td>DECT</td><td>" . "<input type=\"text\" size=\"4\" name=\"eDECT\" value=\"" . $user_source['DECT'] . "\"></td></tr>\n";
+        $html .= 'Hallo,<br />'
+            . 'hier kannst du den Eintrag &auml;ndern. Unter dem Punkt \'Gekommen\' '
+            . 'wird der Engel als anwesend markiert, ein Ja bei Aktiv bedeutet, '
+            . 'dass der Engel aktiv war und damit ein Anspruch auf ein T-Shirt hat. '
+            . 'Wenn T-Shirt ein \'Ja\' enth&auml;lt, bedeutet dies, dass der Engel '
+            . 'bereits sein T-Shirt erhalten hat.<br /><br />' . "\n";
+
+        $html .= '<form action="' . page_link_to('admin_user') . '&action=save&id=$user_id" method="post">' . "\n";
+        $html .= '<table border="0">' . "\n";
+        $html .= '<input type="hidden" name="Type" value="Normal">' . "\n";
+        $html .= '<tr><td>' . "\n";
+        $html .= '<table>' . "\n";
+        $html .= '  <tr><td>Nick</td><td>' . '<input type="text" size="40" name="eNick" value="' . $user_source['Nick'] . '"></td></tr>' . "\n";
+        $html .= '  <tr><td>lastLogIn</td><td>' . date('Y-m-d H:i', $user_source['lastLogIn']) . '</td></tr>' . "\n";
+        $html .= '  <tr><td>Name</td><td>' . '<input type="text" size="40" name="eName" value="' . $user_source['Name'] . '"></td></tr>' . "\n";
+        $html .= '  <tr><td>Vorname</td><td>' . '<input type="text" size="40" name="eVorname" value="' . $user_source['Vorname'] . '"></td></tr>' . "\n";
+        $html .= '  <tr><td>Alter</td><td>' . '<input type="text" size="5" name="eAlter" value="' . $user_source['Alter'] . '"></td></tr>' . "\n";
+        $html .= '  <tr><td>Telefon</td><td>' . '<input type="text" size="40" name="eTelefon" value="' . $user_source['Telefon'] . '"></td></tr>' . "\n";
+        $html .= '  <tr><td>Handy</td><td>' . '<input type="text" size="40" name="eHandy" value="' . $user_source['Handy'] . '"></td></tr>' . "\n";
+        $html .= '  <tr><td>DECT</td><td>' . '<input type="text" size="4" name="eDECT" value="' . $user_source['DECT'] . '"></td></tr>' . "\n";
         if ($user_source['email_by_human_allowed']) {
-            $html .= "  <tr><td>email</td><td>" . "<input type=\"text\" size=\"40\" name=\"eemail\" value=\"" . $user_source['email'] . "\"></td></tr>\n";
+            $html .= "  <tr><td>email</td><td>" . '<input type="text" size="40" name="eemail" value="' . $user_source['email'] . '"></td></tr>' . "\n";
         }
-        $html .= "  <tr><td>jabber</td><td>" . "<input type=\"text\" size=\"40\" name=\"ejabber\" value=\"" . $user_source['jabber'] . "\"></td></tr>\n";
-        $html .= "  <tr><td>Size</td><td>"
-            . html_select_key('size', 'eSize', $tshirt_sizes, $user_source['Size'])
-            . "</td></tr>\n";
+        $html .= "  <tr><td>jabber</td><td>" . '<input type="text" size="40" name="ejabber" value="' . $user_source['jabber'] . '"></td></tr>' . "\n";
+        $html .= '  <tr><td>Size</td><td>'
+            . html_select_key('size', 'eSize', $tshirt_sizes, $user_source['Size']) . '</td></tr>' . "\n";
 
         $options = [
-            '1' => _("Yes"),
-            '0' => _("No")
+            '1' => _('Yes'),
+            '0' => _('No')
         ];
 
         // Gekommen?
-        $html .= "  <tr><td>Gekommen</td><td>\n";
-        $html .= html_options('eGekommen', $options, $user_source['Gekommen']) . "</td></tr>\n";
+        $html .= '  <tr><td>Gekommen</td><td>' . "\n";
+        $html .= html_options('eGekommen', $options, $user_source['Gekommen']) . '</td></tr>' . "\n";
 
         // Aktiv?
-        $html .= "  <tr><td>Aktiv</td><td>\n";
-        $html .= html_options('eAktiv', $options, $user_source['Aktiv']) . "</td></tr>\n";
+        $html .= '  <tr><td>Aktiv</td><td>' . "\n";
+        $html .= html_options('eAktiv', $options, $user_source['Aktiv']) . '</td></tr>' . "\n";
 
         // Aktiv erzwingen
         if (in_array('admin_active', $privileges)) {
-            $html .= "  <tr><td>" . _("Force active") . "</td><td>\n";
-            $html .= html_options('force_active', $options, $user_source['force_active']) . "</td></tr>\n";
+            $html .= '  <tr><td>' . _('Force active') . '</td><td>' . "\n";
+            $html .= html_options('force_active', $options, $user_source['force_active']) . '</td></tr>' . "\n";
         }
 
         // T-Shirt bekommen?
-        $html .= "  <tr><td>T-Shirt</td><td>\n";
-        $html .= html_options('eTshirt', $options, $user_source['Tshirt']) . "</td></tr>\n";
+        $html .= '  <tr><td>T-Shirt</td><td>' . "\n";
+        $html .= html_options('eTshirt', $options, $user_source['Tshirt']) . '</td></tr>' . "\n";
 
-        $html .= "  <tr><td>Hometown</td><td>" . "<input type=\"text\" size=\"40\" name=\"Hometown\" value=\"" . $user_source['Hometown'] . "\"></td></tr>\n";
+        $html .= '  <tr><td>Hometown</td><td>' . '<input type="text" size="40" name="Hometown" value="' . $user_source['Hometown'] . '"></td></tr>' . "\n";
 
-        $html .= "</table>\n</td><td valign=\"top\"></td></tr>";
+        $html .= '</table>' . "\n" . '</td><td valign="top"></td></tr>';
 
-        $html .= "</td></tr>\n";
-        $html .= "</table>\n<br />\n";
-        $html .= "<input type=\"submit\" value=\"Speichern\">\n";
-        $html .= "</form>";
+        $html .= '</td></tr>' . "\n";
+        $html .= '</table>' . "\n" . '<br />' . "\n";
+        $html .= '<input type="submit" value="Speichern">';
+        $html .= '</form>';
 
-        $html .= "<hr />";
+        $html .= '<hr />';
 
         $html .= form_info('', _('Please visit the angeltypes page or the users profile to manage users angeltypes.'));
 
-        $html .= "Hier kannst Du das Passwort dieses Engels neu setzen:<form action=\"" . page_link_to("admin_user") . "&action=change_pw&id=$user_id\" method=\"post\">\n";
-        $html .= "<table>\n";
-        $html .= "  <tr><td>Passwort</td><td>" . "<input type=\"password\" size=\"40\" name=\"new_pw\" value=\"\"></td></tr>\n";
-        $html .= "  <tr><td>Wiederholung</td><td>" . "<input type=\"password\" size=\"40\" name=\"new_pw2\" value=\"\"></td></tr>\n";
+        $html .= 'Hier kannst Du das Passwort dieses Engels neu setzen:<form action="'
+            . page_link_to('admin_user') . '&action=change_pw&id=' . $user_id . '" method="post">' . "\n";
+        $html .= '<table>' . "\n";
+        $html .= '  <tr><td>Passwort</td><td>' . '<input type="password" size="40" name="new_pw" value=""></td></tr>' . "\n";
+        $html .= '  <tr><td>Wiederholung</td><td>' . '<input type="password" size="40" name="new_pw2" value=""></td></tr>' . "\n";
 
-        $html .= "</table>";
-        $html .= "<input type=\"submit\" value=\"Speichern\">\n";
-        $html .= "</form>";
+        $html .= '</table>';
+        $html .= '<input type="submit" value="Speichern">' . "\n";
+        $html .= '</form>';
 
-        $html .= "<hr />";
+        $html .= '<hr />';
 
         $my_highest_group = sql_select("SELECT * FROM `UserGroups` WHERE `uid`='" . sql_escape($user['UID']) . "' ORDER BY `group_id` LIMIT 1");
         if (count($my_highest_group) > 0) {
@@ -110,24 +115,36 @@ function admin_user()
         }
 
         if ($user_id != $user['UID'] && $my_highest_group <= $his_highest_group) {
-            $html .= "Hier kannst Du die Benutzergruppen des Engels festlegen:<form action=\"" . page_link_to("admin_user") . "&action=save_groups&id=" . $user_id . "\" method=\"post\">\n";
+            $html .= 'Hier kannst Du die Benutzergruppen des Engels festlegen:<form action="'
+                . page_link_to('admin_user') . '&action=save_groups&id=' . $user_id . '" method="post">' . "\n";
             $html .= '<table>';
 
-            $groups = sql_select("SELECT * FROM `Groups` LEFT OUTER JOIN `UserGroups` ON (`UserGroups`.`group_id` = `Groups`.`UID` AND `UserGroups`.`uid` = '" . sql_escape($user_id) . "') WHERE `Groups`.`UID` >= '" . sql_escape($my_highest_group) . "' ORDER BY `Groups`.`Name`");
+            $groups = sql_select("
+                SELECT *
+                FROM `Groups`
+                LEFT OUTER JOIN `UserGroups` ON (
+                    `UserGroups`.`group_id` = `Groups`.`UID`
+                    AND `UserGroups`.`uid` = '" . sql_escape($user_id) . "'
+                )
+                WHERE `Groups`.`UID` >= '" . sql_escape($my_highest_group) . "'
+                ORDER BY `Groups`.`Name`
+            ");
             foreach ($groups as $group) {
-                $html .= '<tr><td><input type="checkbox" name="groups[]" value="' . $group['UID'] . '" ' . ($group['group_id'] != "" ? ' checked="checked"' : '') . ' /></td><td>' . $group['Name'] . '</td></tr>';
+                $html .= '<tr><td><input type="checkbox" name="groups[]" value="' . $group['UID'] . '" '
+                    . ($group['group_id'] != '' ? ' checked="checked"' : '')
+                    . ' /></td><td>' . $group['Name'] . '</td></tr>';
             }
 
             $html .= '</table>';
 
-            $html .= "<input type=\"submit\" value=\"Speichern\">\n";
-            $html .= "</form>";
+            $html .= '<input type="submit" value="Speichern">' . "\n";
+            $html .= '</form>';
 
-            $html .= "<hr />";
+            $html .= '<hr />';
         }
 
         $html .= buttons([
-            button(user_delete_link($user_source), glyph('lock') . _("delete"), 'btn-danger')
+            button(user_delete_link($user_source), glyph('lock') . _('delete'), 'btn-danger')
         ]);
 
         $html .= "<hr />";
@@ -139,7 +156,16 @@ function admin_user()
                     $his_highest_group = sql_select("SELECT * FROM `UserGroups` WHERE `uid`='" . sql_escape($user_id) . "' ORDER BY `group_id`");
 
                     if (count($my_highest_group) > 0 && (count($his_highest_group) == 0 || ($my_highest_group[0]['group_id'] <= $his_highest_group[0]['group_id']))) {
-                        $groups_source = sql_select("SELECT * FROM `Groups` LEFT OUTER JOIN `UserGroups` ON (`UserGroups`.`group_id` = `Groups`.`UID` AND `UserGroups`.`uid` = '" . sql_escape($user_id) . "') WHERE `Groups`.`UID` >= '" . sql_escape($my_highest_group[0]['group_id']) . "' ORDER BY `Groups`.`Name`");
+                        $groups_source = sql_select("
+                            SELECT *
+                            FROM `Groups`
+                            LEFT OUTER JOIN `UserGroups` ON (
+                                `UserGroups`.`group_id` = `Groups`.`UID`
+                                AND `UserGroups`.`uid` = '" . sql_escape($user_id) . "'
+                            )
+                            WHERE `Groups`.`UID` >= '" . sql_escape($my_highest_group[0]['group_id']) . "'
+                            ORDER BY `Groups`.`Name`
+                        ");
                         $groups = [];
                         $grouplist = [];
                         foreach ($groups_source as $group) {
@@ -160,14 +186,15 @@ function admin_user()
                             }
                         }
                         $user_source = User($user_id);
-                        engelsystem_log("Set groups of " . User_Nick_render($user_source) . " to: " . join(", ",
-                                $user_groups_info));
-                        $html .= success("Benutzergruppen gespeichert.", true);
+                        engelsystem_log(
+                            'Set groups of ' . User_Nick_render($user_source) . ' to: ' . join(', ', $user_groups_info)
+                        );
+                        $html .= success('Benutzergruppen gespeichert.', true);
                     } else {
-                        $html .= error("Du kannst keine Engel mit mehr Rechten bearbeiten.", true);
+                        $html .= error('Du kannst keine Engel mit mehr Rechten bearbeiten.', true);
                     }
                 } else {
-                    $html .= error("Du kannst Deine eigenen Rechte nicht bearbeiten.", true);
+                    $html .= error('Du kannst Deine eigenen Rechte nicht bearbeiten.', true);
                 }
                 break;
 
@@ -196,24 +223,29 @@ function admin_user()
               WHERE `UID` = '" . sql_escape($user_id) . "' 
               LIMIT 1";
                 sql_query($SQL);
-                engelsystem_log("Updated user: " . $_POST["eNick"] . ", " . $_POST["eSize"] . ", arrived: " . $_POST["eGekommen"] . ", active: " . $_POST["eAktiv"] . ", tshirt: " . $_POST["eTshirt"]);
-                $html .= success("Änderung wurde gespeichert...\n", true);
+                engelsystem_log(
+                    'Updated user: ' . $_POST['eNick'] . ', ' . $_POST['eSize']
+                    . ', arrived: ' . $_POST['eGekommen']
+                    . ', active: ' . $_POST['eAktiv']
+                    . ', tshirt: ' . $_POST['eTshirt']
+                );
+                $html .= success('Änderung wurde gespeichert...' . '\n', true);
                 break;
 
             case 'change_pw':
-                if ($_REQUEST['new_pw'] != "" && $_REQUEST['new_pw'] == $_REQUEST['new_pw2']) {
+                if ($_REQUEST['new_pw'] != '' && $_REQUEST['new_pw'] == $_REQUEST['new_pw2']) {
                     set_password($user_id, $_REQUEST['new_pw']);
                     $user_source = User($user_id);
-                    engelsystem_log("Set new password for " . User_Nick_render($user_source));
-                    $html .= success("Passwort neu gesetzt.", true);
+                    engelsystem_log('Set new password for ' . User_Nick_render($user_source));
+                    $html .= success('Passwort neu gesetzt.', true);
                 } else {
-                    $html .= error("Die Eingaben müssen übereinstimmen und dürfen nicht leer sein!", true);
+                    $html .= error('Die Eingaben müssen übereinstimmen und dürfen nicht leer sein!', true);
                 }
                 break;
         }
     }
 
-    return page_with_title(_("Edit user"), [
+    return page_with_title(_('Edit user'), [
         $html
     ]);
 }
diff --git a/includes/pages/guest_credits.php b/includes/pages/guest_credits.php
index 2e652b6f..d9224cbb 100644
--- a/includes/pages/guest_credits.php
+++ b/includes/pages/guest_credits.php
@@ -5,7 +5,7 @@
  */
 function credits_title()
 {
-    return _("Credits");
+    return _('Credits');
 }
 
 /**
diff --git a/includes/pages/guest_login.php b/includes/pages/guest_login.php
index 258532ee..d202d92d 100644
--- a/includes/pages/guest_login.php
+++ b/includes/pages/guest_login.php
@@ -5,7 +5,7 @@
  */
 function login_title()
 {
-    return _("Login");
+    return _('Login');
 }
 
 /**
@@ -13,7 +13,7 @@ function login_title()
  */
 function register_title()
 {
-    return _("Register");
+    return _('Register');
 }
 
 /**
@@ -21,7 +21,7 @@ function register_title()
  */
 function logout_title()
 {
-    return _("Logout");
+    return _('Logout');
 }
 
 /**
@@ -35,29 +35,29 @@ function guest_register()
 
     $event_config = EventConfig();
 
-    $msg = "";
-    $nick = "";
-    $lastname = "";
-    $prename = "";
-    $age = "";
-    $tel = "";
-    $dect = "";
-    $mobile = "";
-    $mail = "";
+    $msg = '';
+    $nick = '';
+    $lastname = '';
+    $prename = '';
+    $age = '';
+    $tel = '';
+    $dect = '';
+    $mobile = '';
+    $mail = '';
     $email_shiftinfo = false;
     $email_by_human_allowed = false;
-    $jabber = "";
-    $hometown = "";
-    $comment = "";
+    $jabber = '';
+    $hometown = '';
+    $comment = '';
     $tshirt_size = '';
-    $password_hash = "";
+    $password_hash = '';
     $selected_angel_types = [];
     $planned_arrival_date = null;
 
     $angel_types_source = AngelTypes();
     $angel_types = [];
     foreach ($angel_types_source as $angel_type) {
-        $angel_types[$angel_type['id']] = $angel_type['name'] . ($angel_type['restricted'] ? " (restricted)" : "");
+        $angel_types[$angel_type['id']] = $angel_type['name'] . ($angel_type['restricted'] ? ' (restricted)' : '');
         if (!$angel_type['restricted']) {
             $selected_angel_types[] = $angel_type['id'];
         }
@@ -70,12 +70,12 @@ function guest_register()
             $nick = User_validate_Nick($_REQUEST['nick']);
             if (sql_num_query("SELECT * FROM `User` WHERE `Nick`='" . sql_escape($nick) . "' LIMIT 1") > 0) {
                 $valid = false;
-                $msg .= error(sprintf(_("Your nick &quot;%s&quot; already exists."), $nick), true);
+                $msg .= error(sprintf(_('Your nick &quot;%s&quot; already exists.'), $nick), true);
             }
         } else {
             $valid = false;
             $msg .= error(sprintf(
-                _("Your nick &quot;%s&quot; is too short (min. 2 characters)."),
+                _('Your nick &quot;%s&quot; is too short (min. 2 characters).'),
                 User_validate_Nick($_REQUEST['nick'])
             ), true);
         }
@@ -84,11 +84,11 @@ function guest_register()
             $mail = strip_request_item('mail');
             if (!check_email($mail)) {
                 $valid = false;
-                $msg .= error(_("E-mail address is not correct."), true);
+                $msg .= error(_('E-mail address is not correct.'), true);
             }
         } else {
             $valid = false;
-            $msg .= error(_("Please enter your e-mail."), true);
+            $msg .= error(_('Please enter your e-mail.'), true);
         }
 
         if (isset($_REQUEST['email_shiftinfo'])) {
@@ -103,7 +103,7 @@ function guest_register()
             $jabber = strip_request_item('jabber');
             if (!check_email($jabber)) {
                 $valid = false;
-                $msg .= error(_("Please check your jabber account information."), true);
+                $msg .= error(_('Please check your jabber account information.'), true);
             }
         }
 
@@ -112,30 +112,30 @@ function guest_register()
                 $tshirt_size = $_REQUEST['tshirt_size'];
             } else {
                 $valid = false;
-                $msg .= error(_("Please select your shirt size."), true);
+                $msg .= error(_('Please select your shirt size.'), true);
             }
         }
 
         if (isset($_REQUEST['password']) && strlen($_REQUEST['password']) >= $min_password_length) {
             if ($_REQUEST['password'] != $_REQUEST['password2']) {
                 $valid = false;
-                $msg .= error(_("Your passwords don't match."), true);
+                $msg .= error(_('Your passwords don\'t match.'), true);
             }
         } else {
             $valid = false;
             $msg .= error(sprintf(
-                _("Your password is too short (please use at least %s characters)."),
+                _('Your password is too short (please use at least %s characters).'),
                 $min_password_length
             ), true);
         }
 
         if (isset($_REQUEST['planned_arrival_date'])) {
-            $tmp = parse_date("Y-m-d H:i", $_REQUEST['planned_arrival_date'] . " 00:00");
+            $tmp = parse_date('Y-m-d H:i', $_REQUEST['planned_arrival_date'] . ' 00:00');
             $result = User_validate_planned_arrival_date($tmp);
             $planned_arrival_date = $result->getValue();
             if (!$result->isValid()) {
                 $valid = false;
-                error(_("Please enter your planned date of arrival. It should be after the buildup start date and before teardown end date."));
+                error(_('Please enter your planned date of arrival. It should be after the buildup start date and before teardown end date.'));
             }
         }
 
@@ -209,10 +209,10 @@ function guest_register()
             }
 
             engelsystem_log(
-                "User " . User_Nick_render(User($user_id))
-                . " signed up as: " . join(", ", $user_angel_types_info)
+                'User ' . User_Nick_render(User($user_id))
+                . ' signed up as: ' . join(', ', $user_angel_types_info)
             );
-            success(_("Angel registration successful!"));
+            success(_('Angel registration successful!'));
 
             // User is already logged in - that means a supporter has registered an angel. Return to register page.
             if (isset($user)) {
@@ -240,7 +240,7 @@ function guest_register()
     }
 
     return page_with_title(register_title(), [
-        _("By completing this form you're registering as a Chaos-Angel. This script will create you an account in the angel task scheduler."),
+        _('By completing this form you\'re registering as a Chaos-Angel. This script will create you an account in the angel task scheduler.'),
         $msg,
         msg(),
         form([
@@ -248,18 +248,18 @@ function guest_register()
                 div('col-md-6', [
                     div('row', [
                         div('col-sm-4', [
-                            form_text('nick', _("Nick") . ' ' . entry_required(), $nick)
+                            form_text('nick', _('Nick') . ' ' . entry_required(), $nick)
                         ]),
                         div('col-sm-8', [
-                            form_email('mail', _("E-Mail") . ' ' . entry_required(), $mail),
+                            form_email('mail', _('E-Mail') . ' ' . entry_required(), $mail),
                             form_checkbox(
                                 'email_shiftinfo',
-                                _("The engelsystem is allowed to send me an email (e.g. when my shifts change)"),
+                                _('The engelsystem is allowed to send me an email (e.g. when my shifts change)'),
                                 $email_shiftinfo
                             ),
                             form_checkbox(
                                 'email_by_human_allowed',
-                                _("Humans are allowed to send me an email (e.g. for ticket vouchers)"),
+                                _('Humans are allowed to send me an email (e.g. for ticket vouchers)'),
                                 $email_by_human_allowed
                             )
                         ])
@@ -268,22 +268,22 @@ function guest_register()
                         div('col-sm-6', [
                             form_date(
                                 'planned_arrival_date',
-                                _("Planned date of arrival") . ' ' . entry_required(),
+                                _('Planned date of arrival') . ' ' . entry_required(),
                                 $planned_arrival_date, $buildup_start_date, $teardown_end_date
                             )
                         ]),
                         div('col-sm-6', [
                             $enable_tshirt_size ? form_select('tshirt_size',
-                                _("Shirt size") . ' ' . entry_required(),
+                                _('Shirt size') . ' ' . entry_required(),
                                 $tshirt_sizes, $tshirt_size) : ''
                         ])
                     ]),
                     div('row', [
                         div('col-sm-6', [
-                            form_password('password', _("Password") . ' ' . entry_required())
+                            form_password('password', _('Password') . ' ' . entry_required())
                         ]),
                         div('col-sm-6', [
-                            form_password('password2', _("Confirm password") . ' ' . entry_required())
+                            form_password('password2', _('Confirm password') . ' ' . entry_required())
                         ])
                     ]),
                     form_checkboxes(
@@ -291,50 +291,50 @@ function guest_register()
                         _("What do you want to do?") . sprintf(
                             " (<a href=\"%s\">%s</a>)",
                             page_link_to('angeltypes') . '&action=about',
-                            _("Description of job types")
+                            _('Description of job types')
                         ),
                         $angel_types,
                         $selected_angel_types
                     ),
                     form_info(
-                        "",
-                        _("Restricted angel types need will be confirmed later by a supporter. You can change your selection in the options section.")
+                        '',
+                        _('Restricted angel types need will be confirmed later by a supporter. You can change your selection in the options section.')
                     )
                 ]),
                 div('col-md-6', [
                     div('row', [
                         div('col-sm-4', [
-                            form_text('dect', _("DECT"), $dect)
+                            form_text('dect', _('DECT'), $dect)
                         ]),
                         div('col-sm-4', [
-                            form_text('mobile', _("Mobile"), $mobile)
+                            form_text('mobile', _('Mobile'), $mobile)
                         ]),
                         div('col-sm-4', [
-                            form_text('tel', _("Phone"), $tel)
+                            form_text('tel', _('Phone'), $tel)
                         ])
                     ]),
-                    form_text('jabber', _("Jabber"), $jabber),
+                    form_text('jabber', _('Jabber'), $jabber),
                     div('row', [
                         div('col-sm-6', [
-                            form_text('prename', _("First name"), $prename)
+                            form_text('prename', _('First name'), $prename)
                         ]),
                         div('col-sm-6', [
-                            form_text('lastname', _("Last name"), $lastname)
+                            form_text('lastname', _('Last name'), $lastname)
                         ])
                     ]),
                     div('row', [
                         div('col-sm-3', [
-                            form_text('age', _("Age"), $age)
+                            form_text('age', _('Age'), $age)
                         ]),
                         div('col-sm-9', [
-                            form_text('hometown', _("Hometown"), $hometown)
+                            form_text('hometown', _('Hometown'), $hometown)
                         ])
                     ]),
-                    form_info(entry_required() . ' = ' . _("Entry required!"))
+                    form_info(entry_required() . ' = ' . _('Entry required!'))
                 ])
             ]),
-            // form_textarea('comment', _("Did you help at former CCC events and which tasks have you performed then?"), $comment),
-            form_submit('submit', _("Register"))
+            // form_textarea('comment', _('Did you help at former CCC events and which tasks have you performed then?'), $comment),
+            form_submit('submit', _('Register'))
         ])
     ]);
 }
@@ -347,13 +347,13 @@ function entry_required()
 function guest_logout()
 {
     session_destroy();
-    redirect(page_link_to("start"));
+    redirect(page_link_to('start'));
     return true;
 }
 
 function guest_login()
 {
-    $nick = "";
+    $nick = '';
 
     unset($_SESSION['uid']);
     $valid = true;
@@ -367,19 +367,19 @@ function guest_login()
                 if (isset($_REQUEST['password'])) {
                     if (!verify_password($_REQUEST['password'], $login_user['Passwort'], $login_user['UID'])) {
                         $valid = false;
-                        error(_("Your password is incorrect.  Please try it again."));
+                        error(_('Your password is incorrect.  Please try it again.'));
                     }
                 } else {
                     $valid = false;
-                    error(_("Please enter a password."));
+                    error(_('Please enter a password.'));
                 }
             } else {
                 $valid = false;
-                error(_("No user was found with that Nickname. Please try again. If you are still having problems, ask a Dispatcher."));
+                error(_('No user was found with that Nickname. Please try again. If you are still having problems, ask a Dispatcher.'));
             }
         } else {
             $valid = false;
-            error(_("Please enter a nickname."));
+            error(_('Please enter a nickname.'));
         }
 
         if ($valid && !empty($login_user)) {
@@ -401,21 +401,21 @@ function guest_login()
                 div('col-sm-6 col-sm-offset-3 col-md-4 col-md-offset-4', [
                     div('panel panel-primary first', [
                         div('panel-heading', [
-                            '<span class="icon-icon_angel"></span> ' . _("Login")
+                            '<span class="icon-icon_angel"></span> ' . _('Login')
                         ]),
                         div('panel-body', [
                             msg(),
                             form([
-                                form_text_placeholder('nick', _("Nick"), $nick),
-                                form_password_placeholder('password', _("Password")),
-                                form_submit('submit', _("Login")),
+                                form_text_placeholder('nick', _('Nick'), $nick),
+                                form_password_placeholder('password', _('Password')),
+                                form_submit('submit', _('Login')),
                                 !$valid ? buttons([
-                                    button(page_link_to('user_password_recovery'), _("I forgot my password"))
+                                    button(page_link_to('user_password_recovery'), _('I forgot my password'))
                                 ]) : ''
                             ])
                         ]),
                         div('panel-footer', [
-                            glyph('info-sign') . _("Please note: You have to activate cookies!")
+                            glyph('info-sign') . _('Please note: You have to activate cookies!')
                         ])
                     ])
                 ])
@@ -426,10 +426,10 @@ function guest_login()
                     get_register_hint()
                 ]),
                 div('col-sm-6 text-center', [
-                    heading(_("What can I do?"), 2),
-                    '<p>' . _("Please read about the jobs you can do to help us.") . '</p>',
+                    heading(_('What can I do?'), 2),
+                    '<p>' . _('Please read about the jobs you can do to help us.') . '</p>',
                     buttons([
-                        button(page_link_to('angeltypes') . '&action=about', _("Teams/Job description") . ' &raquo;')
+                        button(page_link_to('angeltypes') . '&action=about', _('Teams/Job description') . ' &raquo;')
                     ])
                 ])
             ])
@@ -443,13 +443,13 @@ function get_register_hint()
 
     if (in_array('register', $privileges)) {
         return join('', [
-            '<p>' . _("Please sign up, if you want to help us!") . '</p>',
+            '<p>' . _('Please sign up, if you want to help us!') . '</p>',
             buttons([
                 button(page_link_to('register'), register_title() . ' &raquo;')
             ])
         ]);
     }
 
-    //FIXME: return error(_("Registration is disabled."), true);
-    return error("Registration is <a href='https://engelsystem.de/33c3/overwhelmed.html'>disabled</a>.", true);
+    //FIXME: return error(_('Registration is disabled.'), true);
+    return error('Registration is <a href="https://engelsystem.de/33c3/overwhelmed.html">disabled</a>.', true);
 }
diff --git a/includes/pages/guest_stats.php b/includes/pages/guest_stats.php
index 1994f044..c4e1af74 100644
--- a/includes/pages/guest_stats.php
+++ b/includes/pages/guest_stats.php
@@ -8,27 +8,37 @@ function guest_stats()
         if ($_REQUEST['api_key'] == $api_key) {
             $stats = [];
 
-            list($user_count) = sql_select("SELECT count(*) AS `user_count` FROM `User`");
+            list($user_count) = sql_select('SELECT count(*) AS `user_count` FROM `User`');
             $stats['user_count'] = $user_count['user_count'];
 
-            list($arrived_user_count) = sql_select("SELECT count(*) AS `user_count` FROM `User` WHERE `Gekommen`=1");
+            list($arrived_user_count) = sql_select('SELECT count(*) AS `user_count` FROM `User` WHERE `Gekommen`=1');
             $stats['arrived_user_count'] = $arrived_user_count['user_count'];
 
-            $done_shifts_seconds = sql_select_single_cell("SELECT SUM(`Shifts`.`end` - `Shifts`.`start`) FROM `ShiftEntry` JOIN `Shifts` USING (`SID`) WHERE `Shifts`.`end` < UNIX_TIMESTAMP()");
+            $done_shifts_seconds = sql_select_single_cell('
+                SELECT SUM(`Shifts`.`end` - `Shifts`.`start`)
+                FROM `ShiftEntry`
+                JOIN `Shifts` USING (`SID`)
+                WHERE `Shifts`.`end` < UNIX_TIMESTAMP()
+            ');
             $stats['done_work_hours'] = round($done_shifts_seconds / (60 * 60), 0);
 
-            $users_in_action = sql_select("SELECT `Shifts`.`start`, `Shifts`.`end` FROM `ShiftEntry` JOIN `Shifts` ON `Shifts`.`SID`=`ShiftEntry`.`SID` WHERE UNIX_TIMESTAMP() BETWEEN `Shifts`.`start` AND `Shifts`.`end`");
+            $users_in_action = sql_select('
+                SELECT `Shifts`.`start`, `Shifts`.`end`
+                FROM `ShiftEntry`
+                JOIN `Shifts` ON `Shifts`.`SID`=`ShiftEntry`.`SID`
+                WHERE UNIX_TIMESTAMP() BETWEEN `Shifts`.`start` AND `Shifts`.`end`
+            ');
             $stats['users_in_action'] = count($users_in_action);
 
-            header("Content-Type: application/json");
+            header('Content-Type: application/json');
             raw_output(json_encode($stats));
             return;
         }
         raw_output(json_encode([
-            'error' => "Wrong api_key."
+            'error' => 'Wrong api_key.'
         ]));
     }
     raw_output(json_encode([
-        'error' => "Missing parameter api_key."
+        'error' => 'Missing parameter api_key.'
     ]));
 }
diff --git a/includes/pages/user_atom.php b/includes/pages/user_atom.php
index 42217a3a..913a8821 100644
--- a/includes/pages/user_atom.php
+++ b/includes/pages/user_atom.php
@@ -7,17 +7,17 @@ function user_atom()
 {
     global $user, $display_news;
 
-    if (!isset($_REQUEST['key']) || !preg_match("/^[0-9a-f]{32}$/", $_REQUEST['key'])) {
-        engelsystem_error("Missing key.");
+    if (!isset($_REQUEST['key']) || !preg_match('/^[0-9a-f]{32}$/', $_REQUEST['key'])) {
+        engelsystem_error('Missing key.');
     }
     $key = $_REQUEST['key'];
 
     $user = User_by_api_key($key);
     if ($user == null) {
-        engelsystem_error("Key invalid.");
+        engelsystem_error('Key invalid.');
     }
     if (!in_array('atom', privileges_for_user($user['UID']))) {
-        engelsystem_error("No privilege for atom.");
+        engelsystem_error('No privilege for atom.');
     }
 
     $news = sql_select("
@@ -31,7 +31,7 @@ function user_atom()
     $output = make_atom_entries_from_news($news);
 
     header('Content-Type: application/atom+xml; charset=utf-8');
-    header("Content-Length: " . strlen($output));
+    header('Content-Length: ' . strlen($output));
     raw_output($output);
 }
 
@@ -51,21 +51,21 @@ function make_atom_entries_from_news($news_entries)
             $_SERVER['REQUEST_URI']
         ))
         . '</id>
-  <updated>' . date('Y-m-d\TH:i:sP', $news_entries[0]['Datum']) . "</updated>\n";
+  <updated>' . date('Y-m-d\TH:i:sP', $news_entries[0]['Datum']) . '</updated>' . "\n";
     foreach ($news_entries as $news_entry) {
         $html .= make_atom_entry_from_news($news_entry);
     }
-    $html .= "</feed>";
+    $html .= '</feed>';
     return $html;
 }
 
 function make_atom_entry_from_news($news_entry)
 {
-    return "  <entry>
-    <title>" . htmlspecialchars($news_entry['Betreff']) . "</title>
-    <link href=\"" . page_link_to_absolute("news_comments&amp;nid=") . "${news_entry['ID']}\"/>
-      <id>" . preg_replace('#^https?://#', '', page_link_to_absolute("news")) . "-${news_entry['ID']}</id>
-      <updated>" . date('Y-m-d\TH:i:sP', $news_entry['Datum']) . "</updated>
-    <summary type=\"html\">" . htmlspecialchars($news_entry['Text']) . "</summary>
-    </entry>\n";
+    return '  <entry>
+    <title>' . htmlspecialchars($news_entry['Betreff']) . '</title>
+    <link href="' . page_link_to_absolute('news_comments&amp;nid=') . $news_entry['ID'] . '"/>
+      <id>' . preg_replace('#^https?://#', '', page_link_to_absolute('news')) . '-' . $news_entry['ID'] . '</id>
+      <updated>' . date('Y-m-d\TH:i:sP', $news_entry['Datum']) . '</updated>
+    <summary type="html">' . htmlspecialchars($news_entry['Text']) . '</summary>
+    </entry>' . "\n";
 }
diff --git a/includes/pages/user_ical.php b/includes/pages/user_ical.php
index 929dc7c7..0c4bd49a 100644
--- a/includes/pages/user_ical.php
+++ b/includes/pages/user_ical.php
@@ -7,18 +7,18 @@ function user_ical()
 {
     global $user;
 
-    if (!isset($_REQUEST['key']) || !preg_match("/^[0-9a-f]{32}$/", $_REQUEST['key'])) {
-        engelsystem_error("Missing key.");
+    if (!isset($_REQUEST['key']) || !preg_match('/^[0-9a-f]{32}$/', $_REQUEST['key'])) {
+        engelsystem_error('Missing key.');
     }
     $key = $_REQUEST['key'];
 
     $user = User_by_api_key($key);
     if ($user == null) {
-        engelsystem_error("Key invalid.");
+        engelsystem_error('Key invalid.');
     }
 
     if (!in_array('ical', privileges_for_user($user['UID']))) {
-        engelsystem_error("No privilege for ical.");
+        engelsystem_error('No privilege for ical.');
     }
 
     $ical_shifts = load_ical_shifts();
@@ -33,14 +33,14 @@ function user_ical()
  */
 function send_ical_from_shifts($shifts)
 {
-    header("Content-Type: text/calendar; charset=utf-8");
+    header('Content-Type: text/calendar; charset=utf-8');
     $output = "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//-//Engelsystem//DE\r\nCALSCALE:GREGORIAN\r\n";
     foreach ($shifts as $shift) {
         $output .= make_ical_entry_from_shift($shift);
     }
     $output .= "END:VCALENDAR\r\n";
     $output = trim($output, "\x0A");
-    header("Content-Length: " . strlen($output));
+    header('Content-Length: ' . strlen($output));
     raw_output($output);
 }
 
@@ -53,15 +53,15 @@ function send_ical_from_shifts($shifts)
 function make_ical_entry_from_shift($shift)
 {
     $output = "BEGIN:VEVENT\r\n";
-    $output .= "UID:" . md5($shift['start'] . $shift['end'] . $shift['name']) . "\r\n";
-    $output .= "SUMMARY:" . str_replace("\n", "\\n", $shift['name'])
-        . " (" . str_replace("\n", "\\n", $shift['title']) . ")\r\n";
+    $output .= 'UID:' . md5($shift['start'] . $shift['end'] . $shift['name']) . "\r\n";
+    $output .= 'SUMMARY:' . str_replace("\n", "\\n", $shift['name'])
+        . ' (' . str_replace("\n", "\\n", $shift['title']) . ")\r\n";
     if (isset($shift['Comment'])) {
-        $output .= "DESCRIPTION:" . str_replace("\n", "\\n", $shift['Comment']) . "\r\n";
+        $output .= 'DESCRIPTION:' . str_replace("\n", "\\n", $shift['Comment']) . "\r\n";
     }
-    $output .= "DTSTART;TZID=Europe/Berlin:" . date("Ymd\THis", $shift['start']) . "\r\n";
-    $output .= "DTEND;TZID=Europe/Berlin:" . date("Ymd\THis", $shift['end']) . "\r\n";
-    $output .= "LOCATION:" . $shift['Name'] . "\r\n";
+    $output .= 'DTSTART;TZID=Europe/Berlin:' . date("Ymd\THis", $shift['start']) . "\r\n";
+    $output .= 'DTEND;TZID=Europe/Berlin:' . date("Ymd\THis", $shift['end']) . "\r\n";
+    $output .= 'LOCATION:' . $shift['Name'] . "\r\n";
     $output .= "END:VEVENT\r\n";
     return $output;
 }
diff --git a/includes/pages/user_messages.php b/includes/pages/user_messages.php
index 5e8c2491..00dbafe8 100644
--- a/includes/pages/user_messages.php
+++ b/includes/pages/user_messages.php
@@ -5,7 +5,7 @@
  */
 function messages_title()
 {
-    return _("Messages");
+    return _('Messages');
 }
 
 /**
@@ -35,7 +35,7 @@ function user_messages()
         $users = sql_select("SELECT * FROM `User` WHERE NOT `UID`='" . sql_escape($user['UID']) . "' ORDER BY `Nick`");
 
         $to_select_data = [
-            "" => _("Select recipient...")
+            '' => _('Select recipient...')
         ];
 
         foreach ($users as $u) {
@@ -44,16 +44,22 @@ function user_messages()
 
         $to_select = html_select_key('to', 'to', $to_select_data, '');
 
-        $messages = sql_select("SELECT * FROM `Messages` WHERE `SUID`='" . sql_escape($user['UID']) . "' OR `RUID`='" . sql_escape($user['UID']) . "' ORDER BY `isRead`,`Datum` DESC");
+        $messages = sql_select("
+            SELECT *
+            FROM `Messages`
+            WHERE `SUID`='" . sql_escape($user['UID']) . "'
+            OR `RUID`='" . sql_escape($user['UID']) . "'
+            ORDER BY `isRead`,`Datum` DESC
+        ");
 
         $messages_table = [
             [
                 'news'      => '',
-                'timestamp' => date("Y-m-d H:i"),
+                'timestamp' => date('Y-m-d H:i'),
                 'from'      => User_Nick_render($user),
                 'to'        => $to_select,
                 'text'      => form_textarea('text', '', ''),
-                'actions'   => form_submit('submit', _("Save"))
+                'actions'   => form_submit('submit', _('Save'))
             ]
         ];
 
@@ -63,7 +69,7 @@ function user_messages()
 
             $messages_table_entry = [
                 'new'       => $message['isRead'] == 'N' ? '<span class="glyphicon glyphicon-envelope"></span>' : '',
-                'timestamp' => date("Y-m-d H:i", $message['Datum']),
+                'timestamp' => date('Y-m-d H:i', $message['Datum']),
                 'from'      => User_Nick_render($sender_user_source),
                 'to'        => User_Nick_render($receiver_user_source),
                 'text'      => str_replace("\n", '<br />', $message['Text'])
@@ -72,15 +78,15 @@ function user_messages()
             if ($message['RUID'] == $user['UID']) {
                 if ($message['isRead'] == 'N') {
                     $messages_table_entry['actions'] = button(
-                        page_link_to("user_messages") . '&action=read&id=' . $message['id'],
-                        _("mark as read"),
+                        page_link_to('user_messages') . '&action=read&id=' . $message['id'],
+                        _('mark as read'),
                         'btn-xs'
                     );
                 }
             } else {
                 $messages_table_entry['actions'] = button(
-                    page_link_to("user_messages") . '&action=delete&id=' . $message['id'],
-                    _("delete message"),
+                    page_link_to('user_messages') . '&action=delete&id=' . $message['id'],
+                    _('delete message'),
                     'btn-xs'
                 );
             }
@@ -89,62 +95,62 @@ function user_messages()
 
         return page_with_title(messages_title(), [
             msg(),
-            sprintf(_("Hello %s, here can you leave messages for other angels"), User_Nick_render($user)),
+            sprintf(_('Hello %s, here can you leave messages for other angels'), User_Nick_render($user)),
             form([
                 table([
-                    'new'       => _("New"),
-                    'timestamp' => _("Date"),
-                    'from'      => _("Transmitted"),
-                    'to'        => _("Recipient"),
-                    'text'      => _("Message"),
+                    'new'       => _('New'),
+                    'timestamp' => _('Date'),
+                    'from'      => _('Transmitted'),
+                    'to'        => _('Recipient'),
+                    'text'      => _('Message'),
                     'actions'   => ''
                 ], $messages_table)
             ], page_link_to('user_messages') . '&action=send')
         ]);
     } else {
         switch ($_REQUEST['action']) {
-            case "read":
-                if (isset($_REQUEST['id']) && preg_match("/^[0-9]{1,11}$/", $_REQUEST['id'])) {
+            case 'read':
+                if (isset($_REQUEST['id']) && preg_match('/^[0-9]{1,11}$/', $_REQUEST['id'])) {
                     $message_id = $_REQUEST['id'];
                 } else {
-                    return error(_("Incomplete call, missing Message ID."), true);
+                    return error(_('Incomplete call, missing Message ID.'), true);
                 }
 
                 $message = sql_select("SELECT * FROM `Messages` WHERE `id`='" . sql_escape($message_id) . "' LIMIT 1");
                 if (count($message) > 0 && $message[0]['RUID'] == $user['UID']) {
                     sql_query("UPDATE `Messages` SET `isRead`='Y' WHERE `id`='" . sql_escape($message_id) . "' LIMIT 1");
-                    redirect(page_link_to("user_messages"));
+                    redirect(page_link_to('user_messages'));
                 } else {
-                    return error(_("No Message found."), true);
+                    return error(_('No Message found.'), true);
                 }
                 break;
 
-            case "delete":
-                if (isset($_REQUEST['id']) && preg_match("/^[0-9]{1,11}$/", $_REQUEST['id'])) {
+            case 'delete':
+                if (isset($_REQUEST['id']) && preg_match('/^[0-9]{1,11}$/', $_REQUEST['id'])) {
                     $message_id = $_REQUEST['id'];
                 } else {
-                    return error(_("Incomplete call, missing Message ID."), true);
+                    return error(_('Incomplete call, missing Message ID.'), true);
                 }
 
                 $message = sql_select("SELECT * FROM `Messages` WHERE `id`='" . sql_escape($message_id) . "' LIMIT 1");
                 if (count($message) > 0 && $message[0]['SUID'] == $user['UID']) {
                     sql_query("DELETE FROM `Messages` WHERE `id`='" . sql_escape($message_id) . "' LIMIT 1");
-                    redirect(page_link_to("user_messages"));
+                    redirect(page_link_to('user_messages'));
                 } else {
-                    return error(_("No Message found."), true);
+                    return error(_('No Message found.'), true);
                 }
                 break;
 
-            case "send":
+            case 'send':
                 if (Message_send($_REQUEST['to'], $_REQUEST['text']) === true) {
-                    redirect(page_link_to("user_messages"));
+                    redirect(page_link_to('user_messages'));
                 } else {
-                    return error(_("Transmitting was terminated with an Error."), true);
+                    return error(_('Transmitting was terminated with an Error.'), true);
                 }
                 break;
 
             default:
-                return error(_("Wrong action."), true);
+                return error(_('Wrong action.'), true);
         }
     }
 
diff --git a/includes/pages/user_myshifts.php b/includes/pages/user_myshifts.php
index f9050cdd..2079c789 100644
--- a/includes/pages/user_myshifts.php
+++ b/includes/pages/user_myshifts.php
@@ -5,7 +5,7 @@
  */
 function myshifts_title()
 {
-    return _("My shifts");
+    return _('My shifts');
 }
 
 /**
@@ -20,8 +20,8 @@ function user_myshifts()
 
     if (
         isset($_REQUEST['id'])
-        && in_array("user_shifts_admin", $privileges)
-        && preg_match("/^[0-9]{1,}$/", $_REQUEST['id'])
+        && in_array('user_shifts_admin', $privileges)
+        && preg_match('/^[0-9]{1,}$/', $_REQUEST['id'])
         && sql_num_query("SELECT * FROM `User` WHERE `UID`='" . sql_escape($_REQUEST['id']) . "'") > 0
     ) {
         $user_id = $_REQUEST['id'];
@@ -32,19 +32,19 @@ function user_myshifts()
     list($shifts_user) = sql_select("SELECT * FROM `User` WHERE `UID`='" . sql_escape($user_id) . "' LIMIT 1");
 
     if (isset($_REQUEST['reset'])) {
-        if ($_REQUEST['reset'] == "ack") {
+        if ($_REQUEST['reset'] == 'ack') {
             User_reset_api_key($user);
-            success(_("Key changed."));
+            success(_('Key changed.'));
             redirect(page_link_to('users') . '&action=view&user_id=' . $shifts_user['UID']);
         }
-        return page_with_title(_("Reset API key"), [
+        return page_with_title(_('Reset API key'), [
             error(
-                _("If you reset the key, the url to your iCal- and JSON-export and your atom feed changes! You have to update it in every application using one of these exports."),
+                _('If you reset the key, the url to your iCal- and JSON-export and your atom feed changes! You have to update it in every application using one of these exports.'),
                 true
             ),
-            button(page_link_to('user_myshifts') . '&reset=ack', _("Continue"), 'btn-danger')
+            button(page_link_to('user_myshifts') . '&reset=ack', _('Continue'), 'btn-danger')
         ]);
-    } elseif (isset($_REQUEST['edit']) && preg_match("/^[0-9]*$/", $_REQUEST['edit'])) {
+    } elseif (isset($_REQUEST['edit']) && preg_match('/^[0-9]*$/', $_REQUEST['edit'])) {
         $user_id = $_REQUEST['edit'];
         $shift = sql_select("SELECT
         `ShiftEntry`.`freeloaded`,
@@ -69,12 +69,12 @@ function user_myshifts()
 
             if (isset($_REQUEST['submit'])) {
                 $valid = true;
-                if (in_array("user_shifts_admin", $privileges)) {
+                if (in_array('user_shifts_admin', $privileges)) {
                     $freeloaded = isset($_REQUEST['freeloaded']);
                     $freeload_comment = strip_request_item_nl('freeload_comment');
                     if ($freeloaded && $freeload_comment == '') {
                         $valid = false;
-                        error(_("Please enter a freeload comment!"));
+                        error(_('Please enter a freeload comment!'));
                     }
                 }
 
@@ -93,32 +93,32 @@ function user_myshifts()
                     }
 
                     engelsystem_log(
-                        "Updated " . User_Nick_render($user_source) . "'s shift " . $shift['name']
-                        . " from " . date("Y-m-d H:i", $shift['start'])
-                        . " to " . date("Y-m-d H:i", $shift['end'])
-                        . " with comment " . $comment
-                        . ". Freeloaded: " . ($freeloaded ? "YES Comment: " . $freeload_comment : "NO")
+                        'Updated ' . User_Nick_render($user_source) . '\'s shift ' . $shift['name']
+                        . ' from ' . date('Y-m-d H:i', $shift['start'])
+                        . ' to ' . date('Y-m-d H:i', $shift['end'])
+                        . ' with comment ' . $comment
+                        . '. Freeloaded: ' . ($freeloaded ? 'YES Comment: ' . $freeload_comment : 'NO')
                     );
-                    success(_("Shift saved."));
+                    success(_('Shift saved.'));
                     redirect(page_link_to('users') . '&action=view&user_id=' . $shifts_user['UID']);
                 }
             }
 
             return ShiftEntry_edit_view(
                 User_Nick_render($shifts_user),
-                date("Y-m-d H:i", $shift['start']) . ', ' . shift_length($shift),
+                date('Y-m-d H:i', $shift['start']) . ', ' . shift_length($shift),
                 $shift['Name'],
                 $shift['name'],
                 $shift['angel_type'],
                 $shift['Comment'],
                 $shift['freeloaded'],
                 $shift['freeload_comment'],
-                in_array("user_shifts_admin", $privileges)
+                in_array('user_shifts_admin', $privileges)
             );
         } else {
             redirect(page_link_to('user_myshifts'));
         }
-    } elseif (isset($_REQUEST['cancel']) && preg_match("/^[0-9]*$/", $_REQUEST['cancel'])) {
+    } elseif (isset($_REQUEST['cancel']) && preg_match('/^[0-9]*$/', $_REQUEST['cancel'])) {
         $user_id = $_REQUEST['cancel'];
         $shift = sql_select("
         SELECT *
@@ -137,15 +137,15 @@ function user_myshifts()
                 $shifttype = ShiftType($shift['shifttype_id']);
 
                 engelsystem_log(
-                    "Deleted own shift: " . $shifttype['name']
-                    . " at " . $room['Name']
-                    . " from " . date("Y-m-d H:i", $shift['start'])
-                    . " to " . date("Y-m-d H:i", $shift['end'])
-                    . " as " . $angeltype['name']
+                    'Deleted own shift: ' . $shifttype['name']
+                    . ' at ' . $room['Name']
+                    . ' from ' . date('Y-m-d H:i', $shift['start'])
+                    . ' to ' . date('Y-m-d H:i', $shift['end'])
+                    . ' as ' . $angeltype['name']
                 );
-                success(_("Shift canceled."));
+                success(_('Shift canceled.'));
             } else {
-                error(_("It's too late to sign yourself off the shift. If neccessary, ask the dispatcher to do so."));
+                error(_('It\'s too late to sign yourself off the shift. If neccessary, ask the dispatcher to do so.'));
             }
         } else {
             redirect(user_link($shifts_user));
diff --git a/includes/pages/user_news.php b/includes/pages/user_news.php
index 01da8d27..ceed75f2 100644
--- a/includes/pages/user_news.php
+++ b/includes/pages/user_news.php
@@ -5,7 +5,7 @@
  */
 function user_news_comments_title()
 {
-    return _("News comments");
+    return _('News comments');
 }
 
 /**
@@ -13,7 +13,7 @@ function user_news_comments_title()
  */
 function news_title()
 {
-    return _("News");
+    return _('News');
 }
 
 /**
@@ -21,7 +21,7 @@ function news_title()
  */
 function meetings_title()
 {
-    return _("Meetings");
+    return _('Meetings');
 }
 
 /**
@@ -33,7 +33,7 @@ function user_meetings()
 
     $html = '<div class="col-md-12"><h1>' . meetings_title() . '</h1>' . msg();
 
-    if (isset($_REQUEST['page']) && preg_match("/^[0-9]{1,}$/", $_REQUEST['page'])) {
+    if (isset($_REQUEST['page']) && preg_match('/^[0-9]{1,}$/', $_REQUEST['page'])) {
         $page = $_REQUEST['page'];
     } else {
         $page = 0;
@@ -50,7 +50,7 @@ function user_meetings()
         $html .= display_news($entry);
     }
 
-    $dis_rows = ceil(sql_num_query("SELECT * FROM `News`") / $display_news);
+    $dis_rows = ceil(sql_num_query('SELECT * FROM `News`') / $display_news);
     $html .= '<div class="text-center">' . '<ul class="pagination">';
     for ($i = 0; $i < $dis_rows; $i++) {
         if (isset($_REQUEST['page']) && $i == $_REQUEST['page']) {
@@ -60,7 +60,7 @@ function user_meetings()
         } else {
             $html .= '<li>';
         }
-        $html .= '<a href="' . page_link_to("user_meetings") . '&page=' . $i . '">' . ($i + 1) . '</a></li>';
+        $html .= '<a href="' . page_link_to('user_meetings') . '&page=' . $i . '">' . ($i + 1) . '</a></li>';
     }
     $html .= '</ul></div></div>';
 
@@ -83,20 +83,20 @@ function display_news($news)
     $html .= '<div class="panel-body">' . ReplaceSmilies(nl2br($news['Text'])) . '</div>';
 
     $html .= '<div class="panel-footer text-muted">';
-    if (in_array("admin_news", $privileges)) {
+    if (in_array('admin_news', $privileges)) {
         $html .= '<div class="pull-right">'
-            . button_glyph(page_link_to("admin_news") . '&action=edit&id=' . $news['ID'], 'edit', 'btn-xs')
+            . button_glyph(page_link_to('admin_news') . '&action=edit&id=' . $news['ID'], 'edit', 'btn-xs')
             . '</div>';
     }
-    $html .= '<span class="glyphicon glyphicon-time"></span> ' . date("Y-m-d H:i", $news['Datum']) . '&emsp;';
+    $html .= '<span class="glyphicon glyphicon-time"></span> ' . date('Y-m-d H:i', $news['Datum']) . '&emsp;';
 
     $user_source = User($news['UID']);
 
     $html .= User_Nick_render($user_source);
-    if ($page != "news_comments") {
-        $html .= '&emsp;<a href="' . page_link_to("news_comments") . '&nid=' . $news['ID'] . '">'
+    if ($page != 'news_comments') {
+        $html .= '&emsp;<a href="' . page_link_to('news_comments') . '&nid=' . $news['ID'] . '">'
             . '<span class="glyphicon glyphicon-comment"></span> '
-            . _("Comments") . ' &raquo;</a> '
+            . _('Comments') . ' &raquo;</a> '
             . '<span class="badge">'
             . sql_num_query("SELECT * FROM `NewsComments` WHERE `Refid`='" . sql_escape($news['ID']) . "'")
             . '</span>';
@@ -115,13 +115,13 @@ function user_news_comments()
 
     $html = '<div class="col-md-12"><h1>' . user_news_comments_title() . '</h1>';
     if (
-        isset($_REQUEST["nid"])
-        && preg_match("/^[0-9]{1,}$/", $_REQUEST['nid'])
+        isset($_REQUEST['nid'])
+        && preg_match('/^[0-9]{1,}$/', $_REQUEST['nid'])
         && sql_num_query("SELECT * FROM `News` WHERE `ID`='" . sql_escape($_REQUEST['nid']) . "' LIMIT 1") > 0
     ) {
-        $nid = $_REQUEST["nid"];
+        $nid = $_REQUEST['nid'];
         list($news) = sql_select("SELECT * FROM `News` WHERE `ID`='" . sql_escape($nid) . "' LIMIT 1");
-        if (isset($_REQUEST["text"])) {
+        if (isset($_REQUEST['text'])) {
             $text = preg_replace("/([^\p{L}\p{P}\p{Z}\p{N}\n]{1,})/ui", '', strip_tags($_REQUEST['text']));
             sql_query("
                 INSERT INTO `NewsComments` (`Refid`, `Datum`, `Text`, `UID`)
@@ -132,8 +132,8 @@ function user_news_comments()
                     '" . sql_escape($user["UID"]) . "'
                 )
             ");
-            engelsystem_log("Created news_comment: " . $text);
-            $html .= success(_("Entry saved."), true);
+            engelsystem_log('Created news_comment: ' . $text);
+            $html .= success(_('Entry saved.'), true);
         }
 
         $html .= display_news($news);
@@ -151,13 +151,13 @@ function user_news_comments()
             $html .= '</div>';
         }
 
-        $html .= '<hr /><h2>' . _("New Comment:") . '</h2>';
+        $html .= '<hr /><h2>' . _('New Comment:') . '</h2>';
         $html .= form([
-            form_textarea('text', _("Message"), ''),
-            form_submit('submit', _("Save"))
+            form_textarea('text', _('Message'), ''),
+            form_submit('submit', _('Save'))
         ], page_link_to('news_comments') . '&nid=' . $news['ID']);
     } else {
-        $html .= _("Invalid request.");
+        $html .= _('Invalid request.');
     }
 
     return $html . '</div>';
@@ -172,9 +172,9 @@ function user_news()
 
     $html = '<div class="col-md-12"><h1>' . news_title() . '</h1>' . msg();
 
-    if (isset($_POST["text"]) && isset($_POST["betreff"]) && in_array("admin_news", $privileges)) {
-        if (!isset($_POST["treffen"]) || !in_array("admin_news", $privileges)) {
-            $_POST["treffen"] = 0;
+    if (isset($_POST['text']) && isset($_POST['betreff']) && in_array('admin_news', $privileges)) {
+        if (!isset($_POST['treffen']) || !in_array('admin_news', $privileges)) {
+            $_POST['treffen'] = 0;
         }
         sql_query("
             INSERT INTO `News` (`Datum`, `Betreff`, `Text`, `UID`, `Treffen`)
@@ -186,12 +186,12 @@ function user_news()
                 '" . sql_escape($_POST["treffen"]) . "'
             )
         ");
-        engelsystem_log("Created news: " . $_POST["betreff"] . ", treffen: " . $_POST["treffen"]);
-        success(_("Entry saved."));
+        engelsystem_log('Created news: ' . $_POST['betreff'] . ', treffen: ' . $_POST['treffen']);
+        success(_('Entry saved.'));
         redirect(page_link_to('news'));
     }
 
-    if (isset($_REQUEST['page']) && preg_match("/^[0-9]{1,}$/", $_REQUEST['page'])) {
+    if (isset($_REQUEST['page']) && preg_match('/^[0-9]{1,}$/', $_REQUEST['page'])) {
         $page = $_REQUEST['page'];
     } else {
         $page = 0;
@@ -207,7 +207,7 @@ function user_news()
         $html .= display_news($entry);
     }
 
-    $dis_rows = ceil(sql_num_query("SELECT * FROM `News`") / $display_news);
+    $dis_rows = ceil(sql_num_query('SELECT * FROM `News`') / $display_news);
     $html .= '<div class="text-center">' . '<ul class="pagination">';
     for ($i = 0; $i < $dis_rows; $i++) {
         if (isset($_REQUEST['page']) && $i == $_REQUEST['page']) {
@@ -217,19 +217,19 @@ function user_news()
         } else {
             $html .= '<li>';
         }
-        $html .= '<a href="' . page_link_to("news") . '&page=' . $i . '">' . ($i + 1) . '</a></li>';
+        $html .= '<a href="' . page_link_to('news') . '&page=' . $i . '">' . ($i + 1) . '</a></li>';
     }
     $html .= '</ul></div>';
 
-    if (in_array("admin_news", $privileges)) {
+    if (in_array('admin_news', $privileges)) {
         $html .= '<hr />';
-        $html .= '<h2>' . _("Create news:") . '</h2>';
+        $html .= '<h2>' . _('Create news:') . '</h2>';
 
         $html .= form([
-            form_text('betreff', _("Subject"), ''),
-            form_textarea('text', _("Message"), ''),
-            form_checkbox('treffen', _("Meeting"), false, 1),
-            form_submit('submit', _("Save"))
+            form_text('betreff', _('Subject'), ''),
+            form_textarea('text', _('Message'), ''),
+            form_checkbox('treffen', _('Meeting'), false, 1),
+            form_submit('submit', _('Save'))
         ]);
     }
     return $html . '</div>';
diff --git a/includes/pages/user_questions.php b/includes/pages/user_questions.php
index fa66e8db..b8ebe92d 100644
--- a/includes/pages/user_questions.php
+++ b/includes/pages/user_questions.php
@@ -5,7 +5,7 @@
  */
 function questions_title()
 {
-    return _("Ask the Heaven");
+    return _('Ask the Heaven');
 }
 
 /**
@@ -28,41 +28,41 @@ function user_questions()
             $question['answer_user'] = User_Nick_render($answer_user_source);
         }
 
-        return Questions_view($open_questions, $answered_questions, page_link_to("user_questions") . '&action=ask');
+        return Questions_view($open_questions, $answered_questions, page_link_to('user_questions') . '&action=ask');
     } else {
         switch ($_REQUEST['action']) {
             case 'ask':
                 $question = strip_request_item_nl('question');
-                if ($question != "") {
+                if ($question != '') {
                     $result = sql_query("
                         INSERT INTO `Questions`
                         SET `UID`='" . sql_escape($user['UID']) . "', `Question`='" . sql_escape($question) . "'
                     ");
                     if ($result === false) {
-                        engelsystem_error(_("Unable to save question."));
+                        engelsystem_error(_('Unable to save question.'));
                     }
-                    success(_("You question was saved."));
-                    redirect(page_link_to("user_questions"));
+                    success(_('You question was saved.'));
+                    redirect(page_link_to('user_questions'));
                 } else {
                     return page_with_title(questions_title(), [
-                        error(_("Please enter a question!"), true)
+                        error(_('Please enter a question!'), true)
                     ]);
                 }
                 break;
             case 'delete':
-                if (isset($_REQUEST['id']) && preg_match("/^[0-9]{1,11}$/", $_REQUEST['id'])) {
+                if (isset($_REQUEST['id']) && preg_match('/^[0-9]{1,11}$/', $_REQUEST['id'])) {
                     $question_id = $_REQUEST['id'];
                 } else {
-                    return error(_("Incomplete call, missing Question ID."), true);
+                    return error(_('Incomplete call, missing Question ID.'), true);
                 }
 
                 $question = sql_select("SELECT * FROM `Questions` WHERE `QID`='" . sql_escape($question_id) . "' LIMIT 1");
                 if (count($question) > 0 && $question[0]['UID'] == $user['UID']) {
                     sql_query("DELETE FROM `Questions` WHERE `QID`='" . sql_escape($question_id) . "' LIMIT 1");
-                    redirect(page_link_to("user_questions"));
+                    redirect(page_link_to('user_questions'));
                 } else {
                     return page_with_title(questions_title(), [
-                        error(_("No question found."), true)
+                        error(_('No question found.'), true)
                     ]);
                 }
                 break;
diff --git a/includes/pages/user_settings.php b/includes/pages/user_settings.php
index fe9bb215..b848ff5f 100644
--- a/includes/pages/user_settings.php
+++ b/includes/pages/user_settings.php
@@ -5,7 +5,7 @@
  */
 function settings_title()
 {
-    return _("Settings");
+    return _('Settings');
 }
 
 /**
@@ -25,11 +25,11 @@ function user_settings_main($user_source, $enable_tshirt_size, $tshirt_sizes)
         $user_source['email'] = $result->getValue();
         if (!$result->isValid()) {
             $valid = false;
-            error(_("E-mail address is not correct."));
+            error(_('E-mail address is not correct.'));
         }
     } else {
         $valid = false;
-        error(_("Please enter your e-mail."));
+        error(_('Please enter your e-mail.'));
     }
 
     $user_source['email_shiftinfo'] = isset($_REQUEST['email_shiftinfo']);
@@ -40,7 +40,7 @@ function user_settings_main($user_source, $enable_tshirt_size, $tshirt_sizes)
         $user_source['jabber'] = $result->getValue();
         if (!$result->isValid()) {
             $valid = false;
-            error(_("Please check your jabber account information."));
+            error(_('Please check your jabber account information.'));
         }
     }
 
@@ -51,22 +51,22 @@ function user_settings_main($user_source, $enable_tshirt_size, $tshirt_sizes)
     }
 
     if (isset($_REQUEST['planned_arrival_date'])) {
-        $tmp = parse_date("Y-m-d H:i", $_REQUEST['planned_arrival_date'] . " 00:00");
+        $tmp = parse_date('Y-m-d H:i', $_REQUEST['planned_arrival_date'] . ' 00:00');
         $result = User_validate_planned_arrival_date($tmp);
         $user_source['planned_arrival_date'] = $result->getValue();
         if (!$result->isValid()) {
             $valid = false;
-            error(_("Please enter your planned date of arrival. It should be after the buildup start date and before teardown end date."));
+            error(_('Please enter your planned date of arrival. It should be after the buildup start date and before teardown end date.'));
         }
     }
 
     if (isset($_REQUEST['planned_departure_date'])) {
-        $tmp = parse_date("Y-m-d H:i", $_REQUEST['planned_departure_date'] . " 00:00");
+        $tmp = parse_date('Y-m-d H:i', $_REQUEST['planned_departure_date'] . ' 00:00');
         $result = User_validate_planned_departure_date($user_source['planned_arrival_date'], $tmp);
         $user_source['planned_departure_date'] = $result->getValue();
         if (!$result->isValid()) {
             $valid = false;
-            error(_("Please enter your planned date of departure. It should be after your planned arrival date and after buildup start date and before teardown end date."));
+            error(_('Please enter your planned date of departure. It should be after your planned arrival date and after buildup start date and before teardown end date.'));
         }
     }
 
@@ -81,7 +81,7 @@ function user_settings_main($user_source, $enable_tshirt_size, $tshirt_sizes)
 
     if ($valid) {
         User_update($user_source);
-        success(_("Settings saved."));
+        success(_('Settings saved.'));
         redirect(page_link_to('user_settings'));
     }
 
@@ -100,15 +100,15 @@ function user_settings_password($user_source)
         !isset($_REQUEST['password'])
         || !verify_password($_REQUEST['password'], $user_source['Passwort'], $user_source['UID'])
     ) {
-        error(_("-> not OK. Please try again."));
+        error(_('-> not OK. Please try again.'));
     } elseif (strlen($_REQUEST['new_password']) < $min_password_length) {
-        error(_("Your password is to short (please use at least 6 characters)."));
+        error(_('Your password is to short (please use at least 6 characters).'));
     } elseif ($_REQUEST['new_password'] != $_REQUEST['new_password2']) {
-        error(_("Your passwords don't match."));
+        error(_('Your passwords don\'t match.'));
     } elseif (set_password($user_source['UID'], $_REQUEST['new_password'])) {
-        success(_("Password saved."));
+        success(_('Password saved.'));
     } else {
-        error(_("Failed setting password."));
+        error(_('Failed setting password.'));
     }
     redirect(page_link_to('user_settings'));
 }
@@ -131,9 +131,13 @@ function user_settings_theme($user_source, $themes)
     }
 
     if ($valid) {
-        sql_query("UPDATE `User` SET `color`='" . sql_escape($user_source['color']) . "' WHERE `UID`='" . sql_escape($user_source['UID']) . "'");
+        sql_query("
+            UPDATE `User`
+            SET `color`='" . sql_escape($user_source['color']) . "'
+            WHERE `UID`='" . sql_escape($user_source['UID']) . "'
+        ");
 
-        success(_("Theme changed."));
+        success(_('Theme changed.'));
         redirect(page_link_to('user_settings'));
     }
 
@@ -158,10 +162,14 @@ function user_settings_locale($user_source, $locales)
     }
 
     if ($valid) {
-        sql_query("UPDATE `User` SET `Sprache`='" . sql_escape($user_source['Sprache']) . "' WHERE `UID`='" . sql_escape($user_source['UID']) . "'");
+        sql_query("
+            UPDATE `User`
+            SET `Sprache`='" . sql_escape($user_source['Sprache']) . "'
+            WHERE `UID`='" . sql_escape($user_source['UID']) . "'
+        ");
         $_SESSION['locale'] = $user_source['Sprache'];
 
-        success("Language changed.");
+        success('Language changed.');
         redirect(page_link_to('user_settings'));
     }
 
@@ -202,6 +210,13 @@ function user_settings()
         $user_source = user_settings_locale($user_source, $locales);
     }
 
-    return User_settings_view($user_source, $locales, $themes, $buildup_start_date, $teardown_end_date,
-        $enable_tshirt_size, $tshirt_sizes);
+    return User_settings_view(
+        $user_source,
+        $locales,
+        $themes,
+        $buildup_start_date,
+        $teardown_end_date,
+        $enable_tshirt_size,
+        $tshirt_sizes
+    );
 }
diff --git a/includes/pages/user_shifts.php b/includes/pages/user_shifts.php
index 405b36ab..bfb33f12 100644
--- a/includes/pages/user_shifts.php
+++ b/includes/pages/user_shifts.php
@@ -6,7 +6,7 @@ use Engelsystem\ShiftsFilter;
  */
 function shifts_title()
 {
-    return _("Shifts");
+    return _('Shifts');
 }
 
 /**
@@ -91,9 +91,9 @@ function update_ShiftsFilter(ShiftsFilter $shiftsFilter, $user_shifts_admin, $da
  */
 function load_rooms()
 {
-    $rooms = sql_select("SELECT `RID` AS `id`, `Name` AS `name` FROM `Room` WHERE `show`='Y' ORDER BY `Name`");
+    $rooms = sql_select('SELECT `RID` AS `id`, `Name` AS `name` FROM `Room` WHERE `show`=\'Y\' ORDER BY `Name`');
     if (!$rooms || count($rooms) == 0) {
-        error(_("The administration has not configured any rooms yet."));
+        error(_('The administration has not configured any rooms yet.'));
         redirect('?');
     }
     return $rooms;
@@ -104,12 +104,13 @@ function load_rooms()
  */
 function load_days()
 {
-    $days = sql_select_single_col("
+    $days = sql_select_single_col('
       SELECT DISTINCT DATE(FROM_UNIXTIME(`start`)) AS `id`, DATE(FROM_UNIXTIME(`start`)) AS `name`
       FROM `Shifts`
-      ORDER BY `start`");
+      ORDER BY `start`
+    ');
     if (count($days) == 0) {
-        error(_("The administration has not configured any shifts yet."));
+        error(_('The administration has not configured any shifts yet.'));
         redirect('?');
     }
     return $days;
@@ -122,8 +123,8 @@ function load_types()
 {
     global $user;
 
-    if (sql_num_query("SELECT `id`, `name` FROM `AngelTypes` WHERE `restricted` = 0") == 0) {
-        error(_("The administration has not configured any angeltypes yet - or you are not subscribed to any angeltype."));
+    if (sql_num_query('SELECT `id`, `name` FROM `AngelTypes` WHERE `restricted` = 0') == 0) {
+        error(_('The administration has not configured any angeltypes yet - or you are not subscribed to any angeltype.'));
         redirect('?');
     }
     $types = sql_select("
@@ -146,7 +147,7 @@ function load_types()
         ORDER BY `AngelTypes`.`name`
     ");
     if (empty($types)) {
-        return sql_select("SELECT `id`, `name` FROM `AngelTypes` WHERE `restricted` = 0");
+        return sql_select('SELECT `id`, `name` FROM `AngelTypes` WHERE `restricted` = 0');
     }
     return $types;
 }
@@ -175,56 +176,56 @@ function view_user_shifts()
 
     $shiftCalendarRenderer = shiftCalendarRendererByShiftFilter($shiftsFilter);
 
-    if ($user['api_key'] == "") {
+    if ($user['api_key'] == '') {
         User_reset_api_key($user, false);
     }
 
     $filled = [
         [
             'id'   => '1',
-            'name' => _("occupied")
+            'name' => _('occupied')
         ],
         [
             'id'   => '0',
-            'name' => _("free")
+            'name' => _('free')
         ]
     ];
-    $start_day = date("Y-m-d", $shiftsFilter->getStartTime());
-    $start_time = date("H:i", $shiftsFilter->getStartTime());
-    $end_day = date("Y-m-d", $shiftsFilter->getEndTime());
-    $end_time = date("H:i", $shiftsFilter->getEndTime());
+    $start_day = date('Y-m-d', $shiftsFilter->getStartTime());
+    $start_time = date('H:i', $shiftsFilter->getStartTime());
+    $end_day = date('Y-m-d', $shiftsFilter->getEndTime());
+    $end_time = date('H:i', $shiftsFilter->getEndTime());
 
     return page([
         div('col-md-12', [
             msg(),
             template_render(__DIR__ . '/../../templates/user_shifts.html', [
                 'title'         => shifts_title(),
-                'room_select'   => make_select($rooms, $shiftsFilter->getRooms(), "rooms", _("Rooms")),
-                'start_select'  => html_select_key("start_day", "start_day", array_combine($days, $days), $start_day),
+                'room_select'   => make_select($rooms, $shiftsFilter->getRooms(), 'rooms', _('Rooms')),
+                'start_select'  => html_select_key('start_day', 'start_day', array_combine($days, $days), $start_day),
                 'start_time'    => $start_time,
-                'end_select'    => html_select_key("end_day", "end_day", array_combine($days, $days), $end_day),
+                'end_select'    => html_select_key('end_day', 'end_day', array_combine($days, $days), $end_day),
                 'end_time'      => $end_time,
                 'type_select'   => make_select(
                     $types,
                     $shiftsFilter->getTypes(),
-                    "types",
-                    _("Angeltypes") . '<sup>1</sup>'
+                    'types',
+                    _('Angeltypes') . '<sup>1</sup>'
                 ),
-                'filled_select' => make_select($filled, $shiftsFilter->getFilled(), "filled", _("Occupancy")),
+                'filled_select' => make_select($filled, $shiftsFilter->getFilled(), 'filled', _('Occupancy')),
                 'task_notice'   =>
                     '<sup>1</sup>'
-                    . _("The tasks shown here are influenced by the angeltypes you joined already!")
+                    . _('The tasks shown here are influenced by the angeltypes you joined already!')
                     . ' <a href="' . page_link_to('angeltypes') . '&action=about' . '">'
-                    . _("Description of the jobs.")
+                    . _('Description of the jobs.')
                     . '</a>',
                 'shifts_table'  => msg() . $shiftCalendarRenderer->render(),
-                'ical_text'     => '<h2>' . _("iCal export") . '</h2><p>' . sprintf(
-                        _("Export of shown shifts. <a href=\"%s\">iCal format</a> or <a href=\"%s\">JSON format</a> available (please keep secret, otherwise <a href=\"%s\">reset the api key</a>)."),
+                'ical_text'     => '<h2>' . _('iCal export') . '</h2><p>' . sprintf(
+                        _('Export of shown shifts. <a href="%s">iCal format</a> or <a href="%s">JSON format</a> available (please keep secret, otherwise <a href="%s">reset the api key</a>).'),
                         page_link_to_absolute('ical') . '&key=' . $user['api_key'],
                         page_link_to_absolute('shifts_json_export') . '&key=' . $user['api_key'],
                         page_link_to('user_myshifts') . '&reset'
                     ) . '</p>',
-                'filter'        => _("Filter")
+                'filter'        => _('Filter')
             ])
         ])
     ]);
@@ -236,7 +237,7 @@ function view_user_shifts()
  */
 function get_ids_from_array($array)
 {
-    return $array["id"];
+    return $array['id'];
 }
 
 function make_select($items, $selected, $name, $title = null)
@@ -251,14 +252,14 @@ function make_select($items, $selected, $name, $title = null)
             . '<label><input type="checkbox" name="' . $name . '[]" value="' . $i['id'] . '" '
             . (in_array($i['id'], $selected) ? ' checked="checked"' : '')
             . ' > ' . $i['name'] . '</label>'
-            . (!isset($i['enabled']) || $i['enabled'] ? '' : glyph("lock"))
+            . (!isset($i['enabled']) || $i['enabled'] ? '' : glyph('lock'))
             . '</div><br />';
     }
     $html = '<div id="selection_' . $name . '" class="selection ' . $name . '">' . "\n";
     $html .= implode("\n", $html_items);
     $html .= buttons([
-        button("javascript: checkAll('selection_" . $name . "', true)", _("All"), ""),
-        button("javascript: checkAll('selection_" . $name . "', false)", _("None"), "")
+        button("javascript: checkAll('selection_" . $name . "', true)", _('All'), ''),
+        button("javascript: checkAll('selection_" . $name . "', false)", _('None'), '')
     ]);
     $html .= '</div>' . "\n";
     return $html;