prohibit inline control structures on pages

1 files changed, 371 insertions, 300 deletions

diff --git a/includes/pages/user_shifts.php b/includes/pages/user_shifts.php
index f6167cb3..90be0c6c 100644
--- a/includes/pages/user_shifts.php
+++ b/includes/pages/user_shifts.php
@@ -6,23 +6,26 @@ function shifts_title() {
 
 function user_shifts() {
   global $user, $privileges;
-
-  if (User_is_freeloader($user))
+  
+  if (User_is_freeloader($user)) {
     redirect(page_link_to('user_myshifts'));
-
-    // Locations laden
+  }
+  
+  // Locations laden
   $rooms = sql_select("SELECT * FROM `Room` WHERE `show`='Y' ORDER BY `Name`");
-  $room_array = array();
-  foreach ($rooms as $room)
+  $room_array = [];
+  foreach ($rooms as $room) {
     $room_array[$room['RID']] = $room['Name'];
-
-    // Löschen einzelner Schicht-Einträge (Also Belegung einer Schicht von Engeln) durch Admins
+  }
+  
+  // Löschen einzelner Schicht-Einträge (Also Belegung einer Schicht von Engeln) durch Admins
   if (isset($_REQUEST['entry_id']) && in_array('user_shifts_admin', $privileges)) {
-    if (isset($_REQUEST['entry_id']) && test_request_int('entry_id'))
+    if (isset($_REQUEST['entry_id']) && test_request_int('entry_id')) {
       $entry_id = $_REQUEST['entry_id'];
-    else
+    } else {
       redirect(page_link_to('user_shifts'));
-
+    }
+    
     $shift_entry_source = sql_select("
         SELECT `User`.`Nick`, `ShiftEntry`.`Comment`, `ShiftEntry`.`UID`, `ShiftTypes`.`name`, `Shifts`.*, `Room`.`Name`, `AngelTypes`.`name` as `angel_type`
         FROM `ShiftEntry`
@@ -34,108 +37,115 @@ function user_shifts() {
         WHERE `ShiftEntry`.`id`='" . sql_escape($entry_id) . "'");
     if (count($shift_entry_source) > 0) {
       $shift_entry_source = $shift_entry_source[0];
-
+      
       $result = ShiftEntry_delete($entry_id);
-      if ($result === false)
+      if ($result === false) {
         engelsystem_error('Unable to delete shift entry.');
-
+      }
+      
       engelsystem_log("Deleted " . User_Nick_render($shift_entry_source) . "'s shift: " . $shift_entry_source['name'] . " at " . $shift_entry_source['Name'] . " from " . date("Y-m-d H:i", $shift_entry_source['start']) . " to " . date("Y-m-d H:i", $shift_entry_source['end']) . " as " . $shift_entry_source['angel_type']);
       success(_("Shift entry deleted."));
-    } else
+    } else {
       error(_("Entry not found."));
+    }
     redirect(page_link_to('user_shifts'));
-  }   // Schicht bearbeiten
-  elseif (isset($_REQUEST['edit_shift']) && in_array('admin_shifts', $privileges)) {
+  } elseif (isset($_REQUEST['edit_shift']) && in_array('admin_shifts', $privileges)) {
+    // Schicht bearbeiten
     $msg = "";
     $ok = true;
-
-    if (isset($_REQUEST['edit_shift']) && test_request_int('edit_shift'))
+    
+    if (isset($_REQUEST['edit_shift']) && test_request_int('edit_shift')) {
       $shift_id = $_REQUEST['edit_shift'];
-    else
+    } else {
       redirect(page_link_to('user_shifts'));
-
+    }
+    
     $shift = sql_select("
         SELECT `ShiftTypes`.`name`, `Shifts`.*, `Room`.* FROM `Shifts`
         JOIN `Room` ON (`Shifts`.`RID` = `Room`.`RID`)
         JOIN `ShiftTypes` ON (`ShiftTypes`.`id` = `Shifts`.`shifttype_id`)
         WHERE `SID`='" . sql_escape($shift_id) . "'");
-    if (count($shift) == 0)
+    if (count($shift) == 0) {
       redirect(page_link_to('user_shifts'));
+    }
     $shift = $shift[0];
-
+    
     // Engeltypen laden
     $types = sql_select("SELECT * FROM `AngelTypes` ORDER BY `name`");
-    $angel_types = array();
-    $needed_angel_types = array();
+    $angel_types = [];
+    $needed_angel_types = [];
     foreach ($types as $type) {
       $angel_types[$type['id']] = $type;
       $needed_angel_types[$type['id']] = 0;
     }
-
+    
     $shifttypes_source = ShiftTypes();
     $shifttypes = [];
-    foreach ($shifttypes_source as $shifttype)
+    foreach ($shifttypes_source as $shifttype) {
       $shifttypes[$shifttype['id']] = $shifttype['name'];
-
-      // Benötigte Engeltypen vom Raum
+    }
+    
+    // Benötigte Engeltypen vom Raum
     $needed_angel_types_source = sql_select("SELECT `AngelTypes`.*, `NeededAngelTypes`.`count` FROM `AngelTypes` LEFT JOIN `NeededAngelTypes` ON (`NeededAngelTypes`.`angel_type_id` = `AngelTypes`.`id` AND `NeededAngelTypes`.`room_id`='" . sql_escape($shift['RID']) . "') ORDER BY `AngelTypes`.`name`");
     foreach ($needed_angel_types_source as $type) {
-      if ($type['count'] != "")
+      if ($type['count'] != "") {
         $needed_angel_types[$type['id']] = $type['count'];
+      }
     }
-
+    
     // Benötigte Engeltypen von der Schicht
     $needed_angel_types_source = sql_select("SELECT `AngelTypes`.*, `NeededAngelTypes`.`count` FROM `AngelTypes` LEFT JOIN `NeededAngelTypes` ON (`NeededAngelTypes`.`angel_type_id` = `AngelTypes`.`id` AND `NeededAngelTypes`.`shift_id`='" . sql_escape($shift_id) . "') ORDER BY `AngelTypes`.`name`");
     foreach ($needed_angel_types_source as $type) {
-      if ($type['count'] != "")
+      if ($type['count'] != "") {
         $needed_angel_types[$type['id']] = $type['count'];
+      }
     }
-
+    
     $shifttype_id = $shift['shifttype_id'];
     $title = $shift['title'];
     $rid = $shift['RID'];
     $start = $shift['start'];
     $end = $shift['end'];
-
+    
     if (isset($_REQUEST['submit'])) {
       // Name/Bezeichnung der Schicht, darf leer sein
       $title = strip_request_item('title');
-
+      
       // Auswahl der sichtbaren Locations für die Schichten
-      if (isset($_REQUEST['rid']) && preg_match("/^[0-9]+$/", $_REQUEST['rid']) && isset($room_array[$_REQUEST['rid']]))
+      if (isset($_REQUEST['rid']) && preg_match("/^[0-9]+$/", $_REQUEST['rid']) && isset($room_array[$_REQUEST['rid']])) {
         $rid = $_REQUEST['rid'];
-      else {
+      } else {
         $ok = false;
         $rid = $rooms[0]['RID'];
         $msg .= error(_("Please select a room."), true);
       }
-
-      if (isset($_REQUEST['shifttype_id']) && isset($shifttypes[$_REQUEST['shifttype_id']]))
+      
+      if (isset($_REQUEST['shifttype_id']) && isset($shifttypes[$_REQUEST['shifttype_id']])) {
         $shifttype_id = $_REQUEST['shifttype_id'];
-      else {
+      } else {
         $ok = false;
         $msg .= error(_('Please select a shifttype.'), true);
       }
-
-      if (isset($_REQUEST['start']) && $tmp = DateTime::createFromFormat("Y-m-d H:i", trim($_REQUEST['start'])))
+      
+      if (isset($_REQUEST['start']) && $tmp = DateTime::createFromFormat("Y-m-d H:i", trim($_REQUEST['start']))) {
         $start = $tmp->getTimestamp();
-      else {
+      } else {
         $ok = false;
         $msg .= error(_("Please enter a valid starting time for the shifts."), true);
       }
-
-      if (isset($_REQUEST['end']) && $tmp = DateTime::createFromFormat("Y-m-d H:i", trim($_REQUEST['end'])))
+      
+      if (isset($_REQUEST['end']) && $tmp = DateTime::createFromFormat("Y-m-d H:i", trim($_REQUEST['end']))) {
         $end = $tmp->getTimestamp();
-      else {
+      } else {
         $ok = false;
         $msg .= error(_("Please enter a valid ending time for the shifts."), true);
       }
-
+      
       if ($start >= $end) {
         $ok = false;
         $msg .= error(_("The ending time has to be after the starting time."), true);
       }
-
+      
       foreach ($needed_angel_types_source as $type) {
         if (isset($_REQUEST['type_' . $type['id']]) && preg_match("/^[0-9]+$/", trim($_REQUEST['type_' . $type['id']]))) {
           $needed_angel_types[$type['id']] = trim($_REQUEST['type_' . $type['id']]);
@@ -144,41 +154,43 @@ function user_shifts() {
           $msg .= error(sprintf(_("Please check your input for needed angels of type %s."), $type['name']), true);
         }
       }
-
+      
       if ($ok) {
         $shift['shifttype_id'] = $shifttype_id;
         $shift['title'] = $title;
         $shift['RID'] = $rid;
         $shift['start'] = $start;
         $shift['end'] = $end;
-
+        
         $result = Shift_update($shift);
-        if ($result === false)
+        if ($result === false) {
           engelsystem_error('Unable to update shift.');
+        }
         sql_query("DELETE FROM `NeededAngelTypes` WHERE `shift_id`='" . sql_escape($shift_id) . "'");
-        $needed_angel_types_info = array();
+        $needed_angel_types_info = [];
         foreach ($needed_angel_types as $type_id => $count) {
           sql_query("INSERT INTO `NeededAngelTypes` SET `shift_id`='" . sql_escape($shift_id) . "', `angel_type_id`='" . sql_escape($type_id) . "', `count`='" . sql_escape($count) . "'");
           $needed_angel_types_info[] = $angel_types[$type_id]['name'] . ": " . $count;
         }
-
+        
         engelsystem_log("Updated shift '" . $shifttypes[$shifttype_id] . ", " . $title . "' from " . date("Y-m-d H:i", $start) . " to " . date("Y-m-d H:i", $end) . " with angel types " . join(", ", $needed_angel_types_info));
         success(_("Shift updated."));
-
+        
         redirect(shift_link([
-            'SID' => $shift_id
+            'SID' => $shift_id 
         ]));
       }
     }
-
+    
     $angel_types = "";
-    foreach ($types as $type)
+    foreach ($types as $type) {
       $angel_types .= form_spinner('type_' . $type['id'], $type['name'], $needed_angel_types[$type['id']]);
-
-    return page_with_title(shifts_title(), array(
+    }
+    
+    return page_with_title(shifts_title(), [
         msg(),
         '<noscript>' . info(_("This page is much more comfortable with javascript."), true) . '</noscript>',
-        form(array(
+        form([
             form_select('shifttype_id', _('Shifttype'), $shifttypes, $shifttype_id),
             form_text('title', _("Title"), $title),
             form_select('rid', _("Room:"), $room_array, $rid),
@@ -186,135 +198,154 @@ function user_shifts() {
             form_text('end', _("End:"), date("Y-m-d H:i", $end)),
             '<h2>' . _("Needed angels") . '</h2>',
             $angel_types,
-            form_submit('submit', _("Save"))
-        ))
-    ));
-  }   // Schicht komplett löschen (nur für admins/user mit user_shifts_admin privileg)
-  elseif (isset($_REQUEST['delete_shift']) && in_array('user_shifts_admin', $privileges)) {
-    if (isset($_REQUEST['delete_shift']) && preg_match("/^[0-9]*$/", $_REQUEST['delete_shift']))
+            form_submit('submit', _("Save")) 
+        ]) 
+    ]);
+  } elseif (isset($_REQUEST['delete_shift']) && in_array('user_shifts_admin', $privileges)) {
+    // Schicht komplett löschen (nur für admins/user mit user_shifts_admin privileg)
+    if (isset($_REQUEST['delete_shift']) && preg_match("/^[0-9]*$/", $_REQUEST['delete_shift'])) {
       $shift_id = $_REQUEST['delete_shift'];
-    else
+    } else {
       redirect(page_link_to('user_shifts'));
-
+    }
+    
     $shift = Shift($shift_id);
-    if ($shift === false)
+    if ($shift === false) {
       engelsystem_error('Unable to load shift.');
-    if ($shift == null)
+    }
+    if ($shift == null) {
       redirect(page_link_to('user_shifts'));
-
-      // Schicht löschen bestätigt
+    }
+    
+    // Schicht löschen bestätigt
     if (isset($_REQUEST['delete'])) {
       $result = Shift_delete($shift_id);
-      if ($result === false)
+      if ($result === false) {
         engelsystem_error('Unable to delete shift.');
-
+      }
+      
       engelsystem_log("Deleted shift " . $shift['name'] . " from " . date("Y-m-d H:i", $shift['start']) . " to " . date("Y-m-d H:i", $shift['end']));
       success(_("Shift deleted."));
       redirect(page_link_to('user_shifts'));
     }
-
-    return page_with_title(shifts_title(), array(
+    
+    return page_with_title(shifts_title(), [
         error(sprintf(_("Do you want to delete the shift %s from %s to %s?"), $shift['name'], date("Y-m-d H:i", $shift['start']), date("H:i", $shift['end'])), true),
-        '<a class="button" href="?p=user_shifts&delete_shift=' . $shift_id . '&delete">' . _("delete") . '</a>'
-    ));
+        '<a class="button" href="?p=user_shifts&delete_shift=' . $shift_id . '&delete">' . _("delete") . '</a>' 
+    ]);
   } elseif (isset($_REQUEST['shift_id'])) {
-    if (isset($_REQUEST['shift_id']) && preg_match("/^[0-9]*$/", $_REQUEST['shift_id']))
+    if (isset($_REQUEST['shift_id']) && preg_match("/^[0-9]*$/", $_REQUEST['shift_id'])) {
       $shift_id = $_REQUEST['shift_id'];
-    else
+    } else {
       redirect(page_link_to('user_shifts'));
-
+    }
+    
     $shift = Shift($shift_id);
     $room;
     $shift['Name'] = $room_array[$shift['RID']];
-    if ($shift === false)
+    if ($shift === false) {
       engelsystem_error('Unable to load shift.');
-    if ($shift == null)
+    }
+    if ($shift == null) {
       redirect(page_link_to('user_shifts'));
-
-    if (isset($_REQUEST['type_id']) && preg_match("/^[0-9]*$/", $_REQUEST['type_id']))
+    }
+    
+    if (isset($_REQUEST['type_id']) && preg_match("/^[0-9]*$/", $_REQUEST['type_id'])) {
       $type_id = $_REQUEST['type_id'];
-    else
+    } else {
       redirect(page_link_to('user_shifts'));
-
-    if (in_array('user_shifts_admin', $privileges))
+    }
+    
+    if (in_array('user_shifts_admin', $privileges)) {
       $type = sql_select("SELECT * FROM `AngelTypes` WHERE `id`='" . sql_escape($type_id) . "' LIMIT 1");
-    else
+    } else {
       $type = sql_select("SELECT * FROM `UserAngelTypes` JOIN `AngelTypes` ON (`UserAngelTypes`.`angeltype_id` = `AngelTypes`.`id`) WHERE `AngelTypes`.`id` = '" . sql_escape($type_id) . "' AND (`AngelTypes`.`restricted` = 0 OR (`UserAngelTypes`.`user_id` = '" . sql_escape($user['UID']) . "' AND NOT `UserAngelTypes`.`confirm_user_id` IS NULL)) LIMIT 1");
-
-    if (count($type) == 0)
+    }
+    
+    if (count($type) == 0) {
       redirect(page_link_to('user_shifts'));
+    }
     $type = $type[0];
-
+    
     if (! Shift_signup_allowed($shift, $type)) {
       error(_('You are not allowed to sign up for this shift. Maybe shift is full or already running.'));
       redirect(shift_link($shift));
     }
-
+    
     if (isset($_REQUEST['submit'])) {
       $selected_type_id = $type_id;
       if (in_array('user_shifts_admin', $privileges)) {
-        if (isset($_REQUEST['user_id']) && preg_match("/^[0-9]*$/", $_REQUEST['user_id']))
+        if (isset($_REQUEST['user_id']) && preg_match("/^[0-9]*$/", $_REQUEST['user_id'])) {
           $user_id = $_REQUEST['user_id'];
-        else
+        } else {
           $user_id = $user['UID'];
-
-        if (sql_num_query("SELECT * FROM `User` WHERE `UID`='" . sql_escape($user_id) . "' LIMIT 1") == 0)
+        }
+        
+        if (sql_num_query("SELECT * FROM `User` WHERE `UID`='" . sql_escape($user_id) . "' LIMIT 1") == 0) {
           redirect(page_link_to('user_shifts'));
-
-        if (isset($_REQUEST['angeltype_id']) && test_request_int('angeltype_id') && sql_num_query("SELECT * FROM `AngelTypes` WHERE `id`='" . sql_escape($_REQUEST['angeltype_id']) . "' LIMIT 1") > 0)
+        }
+        
+        if (isset($_REQUEST['angeltype_id']) && test_request_int('angeltype_id') && sql_num_query("SELECT * FROM `AngelTypes` WHERE `id`='" . sql_escape($_REQUEST['angeltype_id']) . "' LIMIT 1") > 0) {
           $selected_type_id = $_REQUEST['angeltype_id'];
-      } else
+        }
+      } else {
         $user_id = $user['UID'];
-
-      if (sql_num_query("SELECT * FROM `ShiftEntry` WHERE `SID`='" . sql_escape($shift['SID']) . "' AND `UID` = '" . sql_escape($user_id) . "'"))
+      }
+      
+      if (sql_num_query("SELECT * FROM `ShiftEntry` WHERE `SID`='" . sql_escape($shift['SID']) . "' AND `UID` = '" . sql_escape($user_id) . "'")) {
         return error("This angel does already have an entry for this shift.", true);
-
+      }
+      
       $freeloaded = $shift['freeloaded'];
       $freeload_comment = $shift['freeload_comment'];
       if (in_array("user_shifts_admin", $privileges)) {
         $freeloaded = isset($_REQUEST['freeloaded']);
         $freeload_comment = strip_request_item_nl('freeload_comment');
       }
-
+      
       $comment = strip_request_item_nl('comment');
-      $result = ShiftEntry_create(array(
+      $result = ShiftEntry_create([
           'SID' => $shift_id,
           'TID' => $selected_type_id,
           'UID' => $user_id,
           'Comment' => $comment,
           'freeloaded' => $freeloaded,
-          'freeload_comment' => $freeload_comment
-      ));
-      if ($result === false)
+          'freeload_comment' => $freeload_comment 
+      ]);
+      if ($result === false) {
         engelsystem_error('Unable to create shift entry.');
-
-      if ($type['restricted'] == 0 && sql_num_query("SELECT * FROM `UserAngelTypes` INNER JOIN `AngelTypes` ON `AngelTypes`.`id` = `UserAngelTypes`.`angeltype_id` WHERE `angeltype_id` = '" . sql_escape($selected_type_id) . "' AND `user_id` = '" . sql_escape($user_id) . "' ") == 0)
+      }
+      
+      if ($type['restricted'] == 0 && sql_num_query("SELECT * FROM `UserAngelTypes` INNER JOIN `AngelTypes` ON `AngelTypes`.`id` = `UserAngelTypes`.`angeltype_id` WHERE `angeltype_id` = '" . sql_escape($selected_type_id) . "' AND `user_id` = '" . sql_escape($user_id) . "' ") == 0) {
         sql_query("INSERT INTO `UserAngelTypes` (`user_id`, `angeltype_id`) VALUES ('" . sql_escape($user_id) . "', '" . sql_escape($selected_type_id) . "')");
-
+      }
+      
       $user_source = User($user_id);
       engelsystem_log("User " . User_Nick_render($user_source) . " signed up for shift " . $shift['name'] . " from " . date("Y-m-d H:i", $shift['start']) . " to " . date("Y-m-d H:i", $shift['end']));
       success(_("You are subscribed. Thank you!") . ' <a href="' . page_link_to('user_myshifts') . '">' . _("My shifts") . ' &raquo;</a>');
       redirect(shift_link($shift));
     }
-
+    
     if (in_array('user_shifts_admin', $privileges)) {
       $users = sql_select("SELECT *, (SELECT count(*) FROM `ShiftEntry` WHERE `freeloaded`=1 AND `ShiftEntry`.`UID`=`User`.`UID`) AS `freeloaded` FROM `User` ORDER BY `Nick`");
-      $users_select = array();
-
-      foreach ($users as $usr)
+      $users_select = [];
+      
+      foreach ($users as $usr) {
         $users_select[$usr['UID']] = $usr['Nick'] . ($usr['freeloaded'] == 0 ? "" : " (" . _("Freeloader") . ")");
+      }
       $user_text = html_select_key('user_id', 'user_id', $users_select, $user['UID']);
-
+      
       $angeltypes_source = sql_select("SELECT * FROM `AngelTypes` ORDER BY `name`");
-      $angeltypes = array();
-      foreach ($angeltypes_source as $angeltype)
+      $angeltypes = [];
+      foreach ($angeltypes_source as $angeltype) {
         $angeltypes[$angeltype['id']] = $angeltype['name'];
+      }
       $angeltyppe_select = html_select_key('angeltype_id', 'angeltype_id', $angeltypes, $type['id']);
     } else {
       $user_text = User_Nick_render($user);
       $angeltyppe_select = $type['name'];
     }
-
+    
     return ShiftEntry_edit_view($user_text, date("Y-m-d H:i", $shift['start']) . ' &ndash; ' . date('Y-m-d H:i', $shift['end']) . ' (' . shift_length($shift) . ')', $shift['Name'], $shift['name'], $angeltyppe_select, "", false, null, in_array('user_shifts_admin', $privileges));
   } else {
     return view_user_shifts();
@@ -324,120 +355,135 @@ function user_shifts() {
 function view_user_shifts() {
   global $user, $privileges;
   global $ical_shifts;
-
-  $ical_shifts = array();
+  
+  $ical_shifts = [];
   $days = sql_select_single_col("
       SELECT DISTINCT DATE(FROM_UNIXTIME(`start`)) AS `id`, DATE(FROM_UNIXTIME(`start`)) AS `name`
       FROM `Shifts`
       ORDER BY `start`");
-
+  
   if (count($days) == 0) {
     error(_("The administration has not configured any shifts yet."));
     redirect('?');
   }
-
+  
   $rooms = sql_select("SELECT `RID` AS `id`, `Name` AS `name` FROM `Room` WHERE `show`='Y' ORDER BY `Name`");
-
+  
   if (count($rooms) == 0) {
     error(_("The administration has not configured any rooms yet."));
     redirect('?');
   }
-
-  if (in_array('user_shifts_admin', $privileges))
+  
+  if (in_array('user_shifts_admin', $privileges)) {
     $types = sql_select("SELECT `id`, `name` FROM `AngelTypes` ORDER BY `AngelTypes`.`name`");
-  else
+  } else {
     $types = sql_select("SELECT `AngelTypes`.`id`, `AngelTypes`.`name`, (`AngelTypes`.`restricted`=0 OR (NOT `UserAngelTypes`.`confirm_user_id` IS NULL OR `UserAngelTypes`.`id` IS NULL)) as `enabled` FROM `AngelTypes` LEFT JOIN `UserAngelTypes` ON (`UserAngelTypes`.`angeltype_id`=`AngelTypes`.`id` AND `UserAngelTypes`.`user_id`='" . sql_escape($user['UID']) . "') ORDER BY `AngelTypes`.`name`");
-  if (empty($types))
+  }
+  if (empty($types)) {
     $types = sql_select("SELECT `id`, `name` FROM `AngelTypes` WHERE `restricted` = 0");
-  $filled = array(
-      array(
+  }
+  $filled = [
+      [
           'id' => '1',
-          'name' => _('occupied')
-      ),
-      array(
+          'name' => _("occupied") 
+      ],
+      [
           'id' => '0',
-          'name' => _('free')
-      )
-  );
-
+          'name' => _("free") 
+      ] 
+  ];
+  
   if (count($types) == 0) {
     error(_("The administration has not configured any angeltypes yet - or you are not subscribed to any angeltype."));
     redirect('?');
   }
-
-  if (! isset($_SESSION['user_shifts']))
-    $_SESSION['user_shifts'] = array();
-
+  
+  if (! isset($_SESSION['user_shifts'])) {
+    $_SESSION['user_shifts'] = [];
+  }
+  
   if (! isset($_SESSION['user_shifts']['filled'])) {
     // User shift admins see free and occupied shifts by default
     $_SESSION['user_shifts']['filled'] = in_array('user_shifts_admin', $privileges) ? [
         0,
-        1
+        1 
     ] : [
-        0
+        0 
     ];
   }
-
-  foreach (array(
+  
+  foreach ([
       'rooms',
       'types',
-      'filled'
-  ) as $key) {
+      'filled' 
+  ] as $key) {
     if (isset($_REQUEST[$key])) {
       $filtered = array_filter($_REQUEST[$key], 'is_numeric');
-      if (! empty($filtered))
+      if (! empty($filtered)) {
         $_SESSION['user_shifts'][$key] = $filtered;
+      }
       unset($filtered);
     }
-    if (! isset($_SESSION['user_shifts'][$key]))
+    if (! isset($_SESSION['user_shifts'][$key])) {
       $_SESSION['user_shifts'][$key] = array_map('get_ids_from_array', $$key);
+    }
   }
-
+  
   if (isset($_REQUEST['rooms'])) {
-    if (isset($_REQUEST['new_style']))
+    if (isset($_REQUEST['new_style'])) {
       $_SESSION['user_shifts']['new_style'] = true;
-    else
+    } else {
       $_SESSION['user_shifts']['new_style'] = false;
+    }
   }
-  if (! isset($_SESSION['user_shifts']['new_style']))
+  if (! isset($_SESSION['user_shifts']['new_style'])) {
     $_SESSION['user_shifts']['new_style'] = true;
-  foreach (array(
+  }
+  foreach ([
       'start',
-      'end'
-  ) as $key) {
-    if (isset($_REQUEST[$key . '_day']) && in_array($_REQUEST[$key . '_day'], $days))
+      'end' 
+  ] as $key) {
+    if (isset($_REQUEST[$key . '_day']) && in_array($_REQUEST[$key . '_day'], $days)) {
       $_SESSION['user_shifts'][$key . '_day'] = $_REQUEST[$key . '_day'];
-    if (isset($_REQUEST[$key . '_time']) && preg_match('#^\d{1,2}:\d\d$#', $_REQUEST[$key . '_time']))
+    }
+    if (isset($_REQUEST[$key . '_time']) && preg_match('#^\d{1,2}:\d\d$#', $_REQUEST[$key . '_time'])) {
       $_SESSION['user_shifts'][$key . '_time'] = $_REQUEST[$key . '_time'];
+    }
     if (! isset($_SESSION['user_shifts'][$key . '_day'])) {
       $time = date('Y-m-d', time() + ($key == 'end' ? 24 * 60 * 60 : 0));
       $_SESSION['user_shifts'][$key . '_day'] = in_array($time, $days) ? $time : ($key == 'end' ? max($days) : min($days));
     }
-    if (! isset($_SESSION['user_shifts'][$key . '_time']))
+    if (! isset($_SESSION['user_shifts'][$key . '_time'])) {
       $_SESSION['user_shifts'][$key . '_time'] = date('H:i');
+    }
   }
-  if ($_SESSION['user_shifts']['start_day'] > $_SESSION['user_shifts']['end_day'])
+  if ($_SESSION['user_shifts']['start_day'] > $_SESSION['user_shifts']['end_day']) {
     $_SESSION['user_shifts']['end_day'] = $_SESSION['user_shifts']['start_day'];
-  if ($_SESSION['user_shifts']['start_day'] == $_SESSION['user_shifts']['end_day'] && $_SESSION['user_shifts']['start_time'] >= $_SESSION['user_shifts']['end_time'])
+  }
+  if ($_SESSION['user_shifts']['start_day'] == $_SESSION['user_shifts']['end_day'] && $_SESSION['user_shifts']['start_time'] >= $_SESSION['user_shifts']['end_time']) {
     $_SESSION['user_shifts']['end_time'] = '23:59';
-
+  }
+  
   if (isset($_SESSION['user_shifts']['start_day'])) {
     $starttime = DateTime::createFromFormat("Y-m-d H:i", $_SESSION['user_shifts']['start_day'] . $_SESSION['user_shifts']['start_time']);
     $starttime = $starttime->getTimestamp();
-  } else
+  } else {
     $starttime = now();
-
+  }
+  
   if (isset($_SESSION['user_shifts']['end_day'])) {
     $endtime = DateTime::createFromFormat("Y-m-d H:i", $_SESSION['user_shifts']['end_day'] . $_SESSION['user_shifts']['end_time']);
     $endtime = $endtime->getTimestamp();
-  } else
+  } else {
     $endtime = now() + 24 * 60 * 60;
-
-  if (! isset($_SESSION['user_shifts']['rooms']) || count($_SESSION['user_shifts']['rooms']) == 0)
-    $_SESSION['user_shifts']['rooms'] = array(
-        0
-    );
-
+  }
+  
+  if (! isset($_SESSION['user_shifts']['rooms']) || count($_SESSION['user_shifts']['rooms']) == 0) {
+    $_SESSION['user_shifts']['rooms'] = [
+        0 
+    ];
+  }
+  
   $SQL = "SELECT DISTINCT `Shifts`.*, `ShiftTypes`.`name`, `Room`.`Name` as `room_name`, nat2.`special_needs` > 0 AS 'has_special_needs'
   FROM `Shifts`
   INNER JOIN `Room` USING (`RID`)
@@ -447,20 +493,21 @@ function view_user_shifts() {
   LEFT JOIN (SELECT se.`SID`, se.`TID`, COUNT(*) as count FROM `ShiftEntry` AS se GROUP BY se.`SID`, se.`TID`) AS entries ON entries.`SID` = `Shifts`.`SID` AND entries.`TID` = nat.`angel_type_id`
   WHERE `Shifts`.`RID` IN (" . implode(',', $_SESSION['user_shifts']['rooms']) . ")
   AND `start` BETWEEN " . $starttime . " AND " . $endtime;
-
+  
   if (count($_SESSION['user_shifts']['filled']) == 1) {
-    if ($_SESSION['user_shifts']['filled'][0] == 0)
+    if ($_SESSION['user_shifts']['filled'][0] == 0) {
       $SQL .= "
       AND (nat.`count` > entries.`count` OR entries.`count` IS NULL OR EXISTS (SELECT `SID` FROM `ShiftEntry` WHERE `UID` = '" . sql_escape($user['UID']) . "' AND `ShiftEntry`.`SID` = `Shifts`.`SID`))";
-    elseif ($_SESSION['user_shifts']['filled'][0] == 1)
+    } elseif ($_SESSION['user_shifts']['filled'][0] == 1) {
       $SQL .= "
     AND (nat.`count` <= entries.`count`  OR EXISTS (SELECT `SID` FROM `ShiftEntry` WHERE `UID` = '" . sql_escape($user['UID']) . "' AND `ShiftEntry`.`SID` = `Shifts`.`SID`))";
+    }
   }
   $SQL .= "
   ORDER BY `start`";
-
+  
   $shifts = sql_select($SQL);
-
+  
   $ownshifts_source = sql_select("
       SELECT `ShiftTypes`.`name`, `Shifts`.*
       FROM `Shifts`
@@ -468,41 +515,43 @@ function view_user_shifts() {
       INNER JOIN `ShiftEntry` ON (`Shifts`.`SID` = `ShiftEntry`.`SID` AND `ShiftEntry`.`UID` = '" . sql_escape($user['UID']) . "')
       WHERE `Shifts`.`RID` IN (" . implode(',', $_SESSION['user_shifts']['rooms']) . ")
       AND `start` BETWEEN " . $starttime . " AND " . $endtime);
-  $ownshifts = array();
-  foreach ($ownshifts_source as $ownshift)
+  $ownshifts = [];
+  foreach ($ownshifts_source as $ownshift) {
     $ownshifts[$ownshift['SID']] = $ownshift;
+  }
   unset($ownshifts_source);
-
+  
   $shifts_table = "";
-  // qqqq
   /*
    * [0] => Array ( [SID] => 1 [start] => 1355958000 [end] => 1355961600 [RID] => 1 [name] => [URL] => [PSID] => [room_name] => test1 [has_special_needs] => 1 [is_full] => 0 )
    */
   if ($_SESSION['user_shifts']['new_style']) {
     $first = 15 * 60 * floor($starttime / (15 * 60));
     $maxshow = ceil(($endtime - $first) / (60 * 15));
-    $block = array();
-    $todo = array();
+    $block = [];
+    $todo = [];
     $myrooms = $rooms;
-
+    
     // delete un-selected rooms from array
     foreach ($myrooms as $k => $v) {
-      if (array_search($v["id"], $_SESSION['user_shifts']['rooms']) === FALSE)
+      if (array_search($v["id"], $_SESSION['user_shifts']['rooms']) === false) {
         unset($myrooms[$k]);
-        // initialize $block array
+      }
+      // initialize $block array
       $block[$v["id"]] = array_fill(0, $maxshow, 0);
     }
-
+    
     // calculate number of parallel shifts in each timeslot for each room
     foreach ($shifts as $k => $shift) {
       $rid = $shift["RID"];
       $blocks = ($shift["end"] - $shift["start"]) / (15 * 60);
       $firstblock = floor(($shift["start"] - $first) / (15 * 60));
-      for ($i = $firstblock; $i < $blocks + $firstblock && $i < $maxshow; $i ++)
+      for ($i = $firstblock; $i < $blocks + $firstblock && $i < $maxshow; $i ++) {
         $block[$rid][$i] ++;
+      }
       $shifts[$k]['own'] = in_array($shift['SID'], array_keys($ownshifts));
     }
-
+    
     $shifts_table = '<div class="shifts-table"><table id="shifts" class="table scrollable"><thead><tr><th>-</th>';
     foreach ($myrooms as $key => $room) {
       $rid = $room["id"];
@@ -513,16 +562,17 @@ function view_user_shifts() {
         continue;
       }
       $colspan = call_user_func_array('max', $block[$rid]);
-      if ($colspan == 0)
+      if ($colspan == 0) {
         $colspan = 1;
+      }
       $todo[$rid] = array_fill(0, $maxshow, $colspan);
       $shifts_table .= "<th" . (($colspan > 1) ? ' colspan="' . $colspan . '"' : '') . ">" . Room_name_render([
           'RID' => $room['id'],
-          'Name' => $room['name']
+          'Name' => $room['name'] 
       ]) . "</th>\n";
     }
     unset($block, $blocks, $firstblock, $colspan, $key, $room);
-
+    
     $shifts_table .= "</tr></thead><tbody>";
     for ($i = 0; $i < $maxshow; $i ++) {
       $thistime = $first + ($i * 15 * 60);
@@ -542,29 +592,31 @@ function view_user_shifts() {
           if ($shift["RID"] == $rid) {
             if (floor($shift["start"] / (15 * 60)) == $thistime / (15 * 60)) {
               $blocks = ($shift["end"] - $shift["start"]) / (15 * 60);
-              if ($blocks < 1)
+              if ($blocks < 1) {
                 $blocks = 1;
-
+              }
+              
               $collides = in_array($shift['SID'], array_keys($ownshifts));
-              if (! $collides)
+              if (! $collides) {
                 foreach ($ownshifts as $ownshift) {
                   if ($ownshift['start'] >= $shift['start'] && $ownshift['start'] < $shift['end'] || $ownshift['end'] > $shift['start'] && $ownshift['end'] <= $shift['end'] || $ownshift['start'] < $shift['start'] && $ownshift['end'] > $shift['end']) {
                     $collides = true;
                     break;
                   }
                 }
-
-                // qqqqqq
+              }
+              
               $is_free = false;
               $shifts_row = '';
-              if (in_array('admin_shifts', $privileges))
-                $shifts_row .= '<div class="pull-right">' . table_buttons(array(
+              if (in_array('admin_shifts', $privileges)) {
+                $shifts_row .= '<div class="pull-right">' . table_buttons([
                     button(page_link_to('user_shifts') . '&edit_shift=' . $shift['SID'], glyph('edit'), 'btn-xs'),
-                    button(page_link_to('user_shifts') . '&delete_shift=' . $shift['SID'], glyph('trash'), 'btn-xs')
-                )) . '</div>';
+                    button(page_link_to('user_shifts') . '&delete_shift=' . $shift['SID'], glyph('trash'), 'btn-xs') 
+                ]) . '</div>';
+              }
               $shifts_row .= Room_name_render([
                   'RID' => $room['id'],
-                  'Name' => $room['name']
+                  'Name' => $room['name'] 
               ]) . '<br />';
               $shifts_row .= '<a href="' . shift_link($shift) . '">' . date('Y-m-d H:i', $shift['start']);
               $shifts_row .= " &ndash; ";
@@ -585,19 +637,21 @@ function view_user_shifts() {
             WHERE
             `count` > 0
             AND ";
-              if ($shift['has_special_needs'])
+              if ($shift['has_special_needs']) {
                 $query .= "`shift_id` = '" . sql_escape($shift['SID']) . "'";
-              else
+              } else {
                 $query .= "`room_id` = '" . sql_escape($shift['RID']) . "'";
-              if (! empty($_SESSION['user_shifts']['types']))
+              }
+              if (! empty($_SESSION['user_shifts']['types'])) {
                 $query .= " AND `angel_type_id` IN (" . implode(',', $_SESSION['user_shifts']['types']) . ") ";
+              }
               $query .= " ORDER BY `AngelTypes`.`name`";
               $angeltypes = sql_select($query);
-
+              
               if (count($angeltypes) > 0) {
                 foreach ($angeltypes as $angeltype) {
                   $entries = sql_select("SELECT * FROM `ShiftEntry` JOIN `User` ON (`ShiftEntry`.`UID` = `User`.`UID`) WHERE `SID`='" . sql_escape($shift['SID']) . "' AND `TID`='" . sql_escape($angeltype['id']) . "' ORDER BY `Nick`");
-                  $entry_list = array();
+                  $entry_list = [];
                   $freeloader = 0;
                   foreach ($entries as $entry) {
                     $style = '';
@@ -605,67 +659,71 @@ function view_user_shifts() {
                       $freeloader ++;
                       $style = " text-decoration: line-through;";
                     }
-                    if (in_array('user_shifts_admin', $privileges))
+                    if (in_array('user_shifts_admin', $privileges)) {
                       $entry_list[] = "<span style=\"$style\">" . User_Nick_render($entry) . ' ' . table_buttons(array(
-                          button(page_link_to('user_shifts') . '&entry_id=' . $entry['id'], glyph('trash'), 'btn-xs')
+                          button(page_link_to('user_shifts') . '&entry_id=' . $entry['id'], glyph('trash'), 'btn-xs') 
                       )) . '</span>';
-                    else
+                    } else {
                       $entry_list[] = "<span style=\"$style\">" . User_Nick_render($entry) . "</span>";
+                    }
                   }
                   if ($angeltype['count'] - count($entries) - $freeloader > 0) {
                     $inner_text = sprintf(ngettext("%d helper needed", "%d helpers needed", $angeltype['count'] - count($entries)), $angeltype['count'] - count($entries));
                     // is the shift still running or alternatively is the user shift admin?
                     $user_may_join_shift = true;
-
+                    
                     // you cannot join if user alread joined a parallel or this shift
                     $user_may_join_shift &= ! $collides;
-
+                    
                     // you cannot join if user is not of this angel type
                     $user_may_join_shift &= isset($angeltype['user_id']);
-
+                    
                     // you cannot join if you are not confirmed
                     if ($angeltype['restricted'] == 1 && isset($angeltype['user_id']))
                       $user_may_join_shift &= isset($angeltype['confirm_user_id']);
-
+                      
                       // you can only join if the shift is in future or running
                     $user_may_join_shift &= time() < $shift['start'];
-
+                    
                     // User shift admins may join anybody in every shift
                     $user_may_join_shift |= in_array('user_shifts_admin', $privileges);
-                    if ($user_may_join_shift)
+                    if ($user_may_join_shift) {
                       $entry_list[] = '<a href="' . page_link_to('user_shifts') . '&amp;shift_id=' . $shift['SID'] . '&amp;type_id=' . $angeltype['id'] . '">' . $inner_text . '</a> ' . button(page_link_to('user_shifts') . '&amp;shift_id=' . $shift['SID'] . '&amp;type_id=' . $angeltype['id'], _('Sign up'), 'btn-xs');
-                    else {
-                      if (time() > $shift['start'])
+                    } else {
+                      if (time() > $shift['start']) {
                         $entry_list[] = $inner_text . ' (' . _('ended') . ')';
-                      elseif ($angeltype['restricted'] == 1 && isset($angeltype['user_id']) && ! isset($angeltype['confirm_user_id']))
+                      } elseif ($angeltype['restricted'] == 1 && isset($angeltype['user_id']) && ! isset($angeltype['confirm_user_id'])) {
                         $entry_list[] = $inner_text . glyph('lock');
-                      elseif ($angeltype['restricted'] == 1)
+                      } elseif ($angeltype['restricted'] == 1) {
                         $entry_list[] = $inner_text;
-                      elseif ($collides)
+                      } elseif ($collides) {
                         $entry_list[] = $inner_text;
-                      else
+                      } else {
                         $entry_list[] = $inner_text . '<br />' . button(page_link_to('user_angeltypes') . '&action=add&angeltype_id=' . $angeltype['id'], sprintf(_('Become %s'), $angeltype['name']), 'btn-xs');
+                      }
                     }
-
+                    
                     unset($inner_text);
                     $is_free = true;
                   }
-
+                  
                   $shifts_row .= '<strong>' . AngelType_name_render($angeltype) . ':</strong> ';
                   $shifts_row .= join(", ", $entry_list);
                   $shifts_row .= '<br />';
                 }
-                if (in_array('user_shifts_admin', $privileges))
+                if (in_array('user_shifts_admin', $privileges)) {
                   $shifts_row .= ' ' . button(page_link_to('user_shifts') . '&amp;shift_id=' . $shift['SID'] . '&amp;type_id=' . $angeltype['id'], _("Add more angels"), 'btn-xs');
+                }
               }
-              if ($shift['own'] && ! in_array('user_shifts_admin', $privileges))
+              if ($shift['own'] && ! in_array('user_shifts_admin', $privileges)) {
                 $class = 'own';
-              elseif ($collides && ! in_array('user_shifts_admin', $privileges))
+              } elseif ($collides && ! in_array('user_shifts_admin', $privileges)) {
                 $class = 'collides';
-              elseif ($is_free)
+              } elseif ($is_free) {
                 $class = 'free';
-              else
+              } else {
                 $class = 'occupied';
+              }
               $shifts_table .= '<td rowspan="' . $blocks . '" class="' . $class . '">';
               $shifts_table .= $shifts_row;
               $shifts_table .= "</td>";
@@ -676,36 +734,39 @@ function view_user_shifts() {
           }
         }
         // fill up row with empty <td>
-        while ($todo[$rid][$i] -- > 0)
+        while ($todo[$rid][$i] -- > 0) {
           $shifts_table .= '<td class="empty"></td>';
+        }
       }
       $shifts_table .= "</tr>\n";
     }
     $shifts_table .= '</tbody></table></div>';
-    // qqq
   } else {
-    $shifts_table = array();
+    $shifts_table = [];
     foreach ($shifts as $shift) {
-      $info = array();
-      if ($_SESSION['user_shifts']['start_day'] != $_SESSION['user_shifts']['end_day'])
+      $info = [];
+      if ($_SESSION['user_shifts']['start_day'] != $_SESSION['user_shifts']['end_day']) {
         $info[] = date("Y-m-d", $shift['start']);
+      }
       $info[] = date("H:i", $shift['start']) . ' - ' . date("H:i", $shift['end']);
-      if (count($_SESSION['user_shifts']['rooms']) > 1)
+      if (count($_SESSION['user_shifts']['rooms']) > 1) {
         $info[] = Room_name_render([
             'Name' => $shift['room_name'],
-            'RID' => $shift['RID']
+            'RID' => $shift['RID'] 
         ]);
-
-      $shift_row = array(
+      }
+      
+      $shift_row = [
           'info' => join('<br />', $info),
-          'entries' => '<a href="' . shift_link($shift) . '">' . $shift['name'] . '</a>' . ($shift['title'] ? '<br />' . $shift['title'] : '')
-      );
-
-      if (in_array('admin_shifts', $privileges))
-        $shift_row['info'] .= ' ' . table_buttons(array(
+          'entries' => '<a href="' . shift_link($shift) . '">' . $shift['name'] . '</a>' . ($shift['title'] ? '<br />' . $shift['title'] : '') 
+      ];
+      
+      if (in_array('admin_shifts', $privileges)) {
+        $shift_row['info'] .= ' ' . table_buttons([
             button(page_link_to('user_shifts') . '&edit_shift=' . $shift['SID'], glyph('edit'), 'btn-xs'),
-            button(page_link_to('user_shifts') . '&delete_shift=' . $shift['SID'], glyph('trash'), 'btn-xs')
-        ));
+            button(page_link_to('user_shifts') . '&delete_shift=' . $shift['SID'], glyph('trash'), 'btn-xs') 
+        ]);
+      }
       $shift_row['entries'] .= '<br />';
       $is_free = false;
       $shift_has_special_needs = 0 < sql_num_query("SELECT `id` FROM `NeededAngelTypes` WHERE `shift_id` = " . $shift['SID']);
@@ -714,30 +775,33 @@ function view_user_shifts() {
     JOIN `AngelTypes` ON (`NeededAngelTypes`.`angel_type_id` = `AngelTypes`.`id`)
     LEFT JOIN `UserAngelTypes` ON (`NeededAngelTypes`.`angel_type_id` = `UserAngelTypes`.`angeltype_id`AND `UserAngelTypes`.`user_id`='" . sql_escape($user['UID']) . "')
     WHERE ";
-      if ($shift_has_special_needs)
+      if ($shift_has_special_needs) {
         $query .= "`shift_id` = '" . sql_escape($shift['SID']) . "'";
-      else
+      } else {
         $query .= "`room_id` = '" . sql_escape($shift['RID']) . "'";
+      }
       $query .= "               AND `count` > 0 ";
-      if (! empty($_SESSION['user_shifts']['types']))
+      if (! empty($_SESSION['user_shifts']['types'])) {
         $query .= "AND `angel_type_id` IN (" . implode(',', $_SESSION['user_shifts']['types']) . ") ";
+      }
       $query .= "ORDER BY `AngelTypes`.`name`";
       $angeltypes = sql_select($query);
       if (count($angeltypes) > 0) {
         $my_shift = sql_num_query("SELECT * FROM `ShiftEntry` WHERE `SID`='" . sql_escape($shift['SID']) . "' AND `UID`='" . sql_escape($user['UID']) . "' LIMIT 1") > 0;
-
+        
         foreach ($angeltypes as &$angeltype) {
           $entries = sql_select("SELECT * FROM `ShiftEntry` JOIN `User` ON (`ShiftEntry`.`UID` = `User`.`UID`) WHERE `SID`='" . sql_escape($shift['SID']) . "' AND `TID`='" . sql_escape($angeltype['id']) . "' ORDER BY `Nick`");
-          $entry_list = array();
+          $entry_list = [];
           $entry_nicks = [];
           $freeloader = 0;
           foreach ($entries as $entry) {
-            if (in_array('user_shifts_admin', $privileges))
+            if (in_array('user_shifts_admin', $privileges)) {
               $member = User_Nick_render($entry) . ' ' . table_buttons(array(
-                  button(page_link_to('user_shifts') . '&entry_id=' . $entry['id'], glyph('trash'), 'btn-xs')
+                  button(page_link_to('user_shifts') . '&entry_id=' . $entry['id'], glyph('trash'), 'btn-xs') 
               ));
-            else
+            } else {
               $member = User_Nick_render($entry);
+            }
             if ($entry['freeloaded']) {
               $member = '<strike>' . $member . '</strike>';
               $freeloader ++;
@@ -747,31 +811,32 @@ function view_user_shifts() {
           }
           $angeltype['taken'] = count($entries) - $freeloader;
           $angeltype['angels'] = $entry_nicks;
-
+          
           // do we need more angles of this type?
           if ($angeltype['count'] - count($entries) + $freeloader > 0) {
             $inner_text = sprintf(ngettext("%d helper needed", "%d helpers needed", $angeltype['count'] - count($entries) + $freeloader), $angeltype['count'] - count($entries) + $freeloader);
             // is the shift still running or alternatively is the user shift admin?
             $user_may_join_shift = true;
-
+            
             /* you cannot join if user already joined this shift */
             $user_may_join_shift &= ! $my_shift;
-
+            
             // you cannot join if user is not of this angel type
             $user_may_join_shift &= isset($angeltype['user_id']);
-
+            
             // you cannot join if you are not confirmed
-            if ($angeltype['restricted'] == 1 && isset($angeltype['user_id']))
+            if ($angeltype['restricted'] == 1 && isset($angeltype['user_id'])) {
               $user_may_join_shift &= isset($angeltype['confirm_user_id']);
-
-              // you can only join if the shift is in future or running
+            }
+            
+            // you can only join if the shift is in future or running
             $user_may_join_shift &= time() < $shift['start'];
-
+            
             // User shift admins may join anybody in every shift
             $user_may_join_shift |= in_array('user_shifts_admin', $privileges);
-            if ($user_may_join_shift)
+            if ($user_may_join_shift) {
               $entry_list[] = '<a href="' . page_link_to('user_shifts') . '&amp;shift_id=' . $shift['SID'] . '&amp;type_id=' . $angeltype['id'] . '">' . $inner_text . ' &raquo;</a>';
-            else {
+            } else {
               if (time() > $shift['end']) {
                 $entry_list[] = $inner_text . ' (vorbei)';
               } elseif ($angeltype['restricted'] == 1 && isset($angeltype['user_id']) && ! isset($angeltype['confirm_user_id'])) {
@@ -780,11 +845,11 @@ function view_user_shifts() {
                 $entry_list[] = $inner_text . ' <a href="' . page_link_to('user_angeltypes') . '&action=add&angeltype_id=' . $angeltype['id'] . '">' . sprintf(_('Become %s'), $angeltype['name']) . '</a>';
               }
             }
-
+            
             unset($inner_text);
             $is_free = true;
           }
-
+          
           $shift_row['entries'] .= '<b>' . $angeltype['name'] . ':</b> ';
           $shift_row['entries'] .= join(", ", $entry_list);
           $shift_row['entries'] .= '<br />';
@@ -797,35 +862,36 @@ function view_user_shifts() {
         $ical_shifts[] = $shift;
       }
     }
-    $shifts_table = table(array(
+    $shifts_table = table([
         'info' => _("Time") . "/" . _("Room"),
-        'entries' => _("Entries")
-    ), $shifts_table);
+        'entries' => _("Entries") 
+    ], $shifts_table);
   }
-
-  if ($user['api_key'] == "")
+  
+  if ($user['api_key'] == "") {
     User_reset_api_key($user, false);
-
-  return page(array(
-      '<div class="col-md-12">',
-      msg(),
-      template_render('../templates/user_shifts.html', array(
-          'title' => shifts_title(),
-          'room_select' => make_select($rooms, $_SESSION['user_shifts']['rooms'], "rooms", _("Rooms")),
-          'start_select' => html_select_key("start_day", "start_day", array_combine($days, $days), $_SESSION['user_shifts']['start_day']),
-          'start_time' => $_SESSION['user_shifts']['start_time'],
-          'end_select' => html_select_key("end_day", "end_day", array_combine($days, $days), $_SESSION['user_shifts']['end_day']),
-          'end_time' => $_SESSION['user_shifts']['end_time'],
-          'type_select' => make_select($types, $_SESSION['user_shifts']['types'], "types", _("Angeltypes") . '<sup>1</sup>'),
-          'filled_select' => make_select($filled, $_SESSION['user_shifts']['filled'], "filled", _("Occupancy")),
-          'task_notice' => '<sup>1</sup>' . _("The tasks shown here are influenced by the preferences you defined in your settings!") . " <a href=\"" . page_link_to('angeltypes') . '&action=about' . "\">" . _("Description of the jobs.") . "</a>",
-          'new_style_checkbox' => '<label><input type="checkbox" name="new_style" value="1" ' . ($_SESSION['user_shifts']['new_style'] ? ' checked' : '') . '> ' . _("Use new style if possible") . '</label>',
-          'shifts_table' => msg() . $shifts_table,
-          '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")
-      )),
-      '</div>'
-  ));
+  }
+  
+  return page([
+      div('col-md-12', [
+          msg(),
+          template_render('../templates/user_shifts.html', [
+              'title' => shifts_title(),
+              'room_select' => make_select($rooms, $_SESSION['user_shifts']['rooms'], "rooms", _("Rooms")),
+              'start_select' => html_select_key("start_day", "start_day", array_combine($days, $days), $_SESSION['user_shifts']['start_day']),
+              'start_time' => $_SESSION['user_shifts']['start_time'],
+              'end_select' => html_select_key("end_day", "end_day", array_combine($days, $days), $_SESSION['user_shifts']['end_day']),
+              'end_time' => $_SESSION['user_shifts']['end_time'],
+              'type_select' => make_select($types, $_SESSION['user_shifts']['types'], "types", _("Angeltypes") . '<sup>1</sup>'),
+              'filled_select' => make_select($filled, $_SESSION['user_shifts']['filled'], "filled", _("Occupancy")),
+              'task_notice' => '<sup>1</sup>' . _("The tasks shown here are influenced by the preferences you defined in your settings!") . " <a href=\"" . page_link_to('angeltypes') . '&action=about' . "\">" . _("Description of the jobs.") . "</a>",
+              'new_style_checkbox' => '<label><input type="checkbox" name="new_style" value="1" ' . ($_SESSION['user_shifts']['new_style'] ? ' checked' : '') . '> ' . _("Use new style if possible") . '</label>',
+              'shifts_table' => msg() . $shifts_table,
+              '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") 
+          ]) 
+      ]) 
+  ]);
 }
 
 function make_user_shifts_export_link($page, $key) {
@@ -833,12 +899,15 @@ function make_user_shifts_export_link($page, $key) {
   $link = "&start_time=" . $_SESSION['user_shifts']['start_time'];
   $link = "&end_day=" . $_SESSION['user_shifts']['end_day'];
   $link = "&end_time=" . $_SESSION['user_shifts']['end_time'];
-  foreach ($_SESSION['user_shifts']['rooms'] as $room)
+  foreach ($_SESSION['user_shifts']['rooms'] as $room) {
     $link .= '&rooms[]=' . $room;
-  foreach ($_SESSION['user_shifts']['types'] as $type)
+  }
+  foreach ($_SESSION['user_shifts']['types'] as $type) {
     $link .= '&types[]=' . $type;
-  foreach ($_SESSION['user_shifts']['filled'] as $filled)
+  }
+  foreach ($_SESSION['user_shifts']['filled'] as $filled) {
     $link .= '&filled[]=' . $filled;
+  }
   return page_link_to_absolute($page) . $link . '&export=user_shifts&key=' . $key;
 }
 
@@ -847,18 +916,20 @@ function get_ids_from_array($array) {
 }
 
 function make_select($items, $selected, $name, $title = null) {
-  $html_items = array();
-  if (isset($title))
+  $html_items = [];
+  if (isset($title)) {
     $html_items[] = '<h4>' . $title . '</h4>' . "\n";
-
-  foreach ($items as $i)
+  }
+  
+  foreach ($items as $i) {
     $html_items[] = '<div class="checkbox"><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")) . '</div><br />';
+  }
   $html = '<div id="selection_' . $name . '" class="selection ' . $name . '">' . "\n";
   $html .= implode("\n", $html_items);
-  $html .= buttons(array(
+  $html .= buttons([
       button("javascript: checkAll('selection_" . $name . "', true)", _("All"), ""),
-      button("javascript: checkAll('selection_" . $name . "', false)", _("None"), "")
-  ));
+      button("javascript: checkAll('selection_" . $name . "', false)", _("None"), "") 
+  ]);
   $html .= '</div>' . "\n";
   return $html;
 }