From 91dafb19ec171e747d9976cf738606759bde3aae Mon Sep 17 00:00:00 2001 From: msquare Date: Thu, 29 Sep 2016 10:53:17 +0200 Subject: prohibit inline control structures on pages --- includes/pages/admin_shifts.php | 173 ++++++++++++++++++++++------------------ 1 file changed, 97 insertions(+), 76 deletions(-) (limited to 'includes/pages/admin_shifts.php') diff --git a/includes/pages/admin_shifts.php b/includes/pages/admin_shifts.php index 692f79a7..3682b38c 100644 --- a/includes/pages/admin_shifts.php +++ b/includes/pages/admin_shifts.php @@ -14,40 +14,46 @@ function admin_shifts() { $mode = 'single'; $angelmode = 'manually'; $length = ''; - $change_hours = array(); + $change_hours = []; $title = ""; $shifttype_id = null; // Locations laden (auch unsichtbare - fuer Erzengel ist das ok) $rooms = sql_select("SELECT * FROM `Room` ORDER BY `Name`"); - $room_array = array(); - foreach ($rooms as $room) + $room_array = []; + foreach ($rooms as $room) { $room_array[$room['RID']] = $room['Name']; - - // Engeltypen laden + } + + // Engeltypen laden $types = sql_select("SELECT * FROM `AngelTypes` ORDER BY `name`"); - $needed_angel_types = array(); - foreach ($types as $type) + $needed_angel_types = []; + foreach ($types as $type) { $needed_angel_types[$type['id']] = 0; - - // Load shift types + } + + // Load shift types $shifttypes_source = ShiftTypes(); - if ($shifttypes_source === false) + if ($shifttypes_source === false) { engelsystem_error('Unable to load shift types.'); + } $shifttypes = []; - foreach ($shifttypes_source as $shifttype) + foreach ($shifttypes_source as $shifttype) { $shifttypes[$shifttype['id']] = $shifttype['name']; + } if (isset($_REQUEST['preview']) || isset($_REQUEST['back'])) { if (isset($_REQUEST['shifttype_id'])) { $shifttype = ShiftType($_REQUEST['shifttype_id']); - if ($shifttype === false) + if ($shifttype === false) { engelsystem_error('Unable to load shift type.'); + } if ($shifttype == null) { $ok = false; error(_('Please select a shift type.')); - } else + } else { $shifttype_id = $_REQUEST['shifttype_id']; + } } else { $ok = false; error(_('Please select a shift type.')); @@ -57,24 +63,24 @@ function admin_shifts() { $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']; error(_('Please select a location.')); } - 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; error(_('Please select a start time.')); } - 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; error(_('Please select an end time.')); } @@ -136,43 +142,47 @@ function admin_shifts() { } // Beim Zurück-Knopf das Formular zeigen - if (isset($_REQUEST['back'])) + if (isset($_REQUEST['back'])) { $ok = false; - - // Alle Eingaben in Ordnung + } + + // Alle Eingaben in Ordnung if ($ok) { if ($angelmode == 'location') { - $needed_angel_types = array(); + $needed_angel_types = []; $needed_angel_types_location = sql_select("SELECT * FROM `NeededAngelTypes` WHERE `room_id`='" . sql_escape($rid) . "'"); - foreach ($needed_angel_types_location as $type) + foreach ($needed_angel_types_location as $type) { $needed_angel_types[$type['angel_type_id']] = $type['count']; + } } - $shifts = array(); + $shifts = []; if ($mode == 'single') { - $shifts[] = array( + $shifts[] = [ 'start' => $start, 'end' => $end, 'RID' => $rid, 'title' => $title, 'shifttype_id' => $shifttype_id - ); + ]; } elseif ($mode == 'multi') { $shift_start = $start; do { $shift_end = $shift_start + $length * 60; - if ($shift_end > $end) + if ($shift_end > $end) { $shift_end = $end; - if ($shift_start >= $shift_end) + } + if ($shift_start >= $shift_end) { break; + } - $shifts[] = array( + $shifts[] = [ 'start' => $shift_start, 'end' => $shift_end, 'RID' => $rid, 'title' => $title, 'shifttype_id' => $shifttype_id - ); + ]; $shift_start = $shift_end; } while ($shift_end < $end); @@ -182,14 +192,15 @@ function admin_shifts() { $change_index = 0; // Ersten/nächsten passenden Schichtwechsel suchen foreach ($change_hours as $i => $change_hour) { - if ($start < $day + $change_hour * 60 * 60) + if ($start < $day + $change_hour * 60 * 60) { $change_index = $i; - elseif ($start == $day + $change_hour * 60 * 60) { + } elseif ($start == $day + $change_hour * 60 * 60) { // Start trifft Schichtwechsel $change_index = ($i + count($change_hours) - 1) % count($change_hours); break; - } else + } else { break; + } } $shift_start = $start; @@ -197,35 +208,38 @@ function admin_shifts() { $day = DateTime::createFromFormat("Y-m-d H:i", date("Y-m-d", $shift_start) . " 00:00")->getTimestamp(); $shift_end = $day + $change_hours[$change_index] * 60 * 60; - if ($shift_end > $end) + if ($shift_end > $end) { $shift_end = $end; - if ($shift_start >= $shift_end) + } + if ($shift_start >= $shift_end) { $shift_end += 24 * 60 * 60; + } - $shifts[] = array( + $shifts[] = [ 'start' => $shift_start, 'end' => $shift_end, 'RID' => $rid, 'title' => $title, 'shifttype_id' => $shifttype_id - ); + ]; $shift_start = $shift_end; $change_index = ($change_index + count($change_hours) - 1) % count($change_hours); } while ($shift_end < $end); } - $shifts_table = array(); + $shifts_table = []; foreach ($shifts as $shift) { $shifts_table_entry = [ 'timeslot' => ' ' . date("Y-m-d H:i", $shift['start']) . ' - ' . date("H:i", $shift['end']) . '
' . Room_name_render(Room($shift['RID'])), 'title' => ShiftType_name_render(ShiftType($shifttype_id)) . ($shift['title'] ? '
' . $shift['title'] : ''), 'needed_angels' => '' ]; - foreach ($types as $type) - if (isset($needed_angel_types[$type['id']]) && $needed_angel_types[$type['id']] > 0) + foreach ($types as $type) { + if (isset($needed_angel_types[$type['id']]) && $needed_angel_types[$type['id']] > 0) { $shifts_table_entry['needed_angels'] .= '' . AngelType_name_render($type) . ': ' . $needed_angel_types[$type['id']] . '
'; - + } + } $shifts_table[] = $shifts_table_entry; } @@ -234,10 +248,11 @@ function admin_shifts() { $_SESSION['admin_shifts_types'] = $needed_angel_types; $hidden_types = ""; - foreach ($needed_angel_types as $type_id => $count) + foreach ($needed_angel_types as $type_id => $count) { $hidden_types .= form_hidden('type_' . $type_id, $count); - return page_with_title(_("Preview"), array( - form(array( + } + return page_with_title(_("Preview"), [ + form([ $hidden_types, form_hidden('shifttype_id', $shifttype_id), form_hidden('title', $title), @@ -249,28 +264,30 @@ function admin_shifts() { form_hidden('change_hours', implode(', ', $change_hours)), form_hidden('angelmode', $angelmode), form_submit('back', _("back")), - table(array( + table([ 'timeslot' => _('Time and location'), 'title' => _('Type and title'), 'needed_angels' => _('Needed angels') - ), $shifts_table), + ], $shifts_table), form_submit('submit', _("Save")) - )) - )); + ]) + ]); } } elseif (isset($_REQUEST['submit'])) { - if (! is_array($_SESSION['admin_shifts_shifts']) || ! is_array($_SESSION['admin_shifts_types'])) + if (! is_array($_SESSION['admin_shifts_shifts']) || ! is_array($_SESSION['admin_shifts_types'])) { redirect(page_link_to('admin_shifts')); + } foreach ($_SESSION['admin_shifts_shifts'] as $shift) { $shift['URL'] = null; $shift['PSID'] = null; $shift_id = Shift_create($shift); - if ($shift_id === false) + if ($shift_id === false) { engelsystem_error('Unable to create shift.'); + } 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'])); - $needed_angel_types_info = array(); + $needed_angel_types_info = []; foreach ($_SESSION['admin_shifts_types'] as $type_id => $count) { $angel_type_source = sql_select("SELECT * FROM `AngelTypes` WHERE `id`='" . sql_escape($type_id) . "' LIMIT 1"); if (count($angel_type_source) > 0) { @@ -288,38 +305,42 @@ function admin_shifts() { unset($_SESSION['admin_shifts_types']); } - if (! isset($_REQUEST['rid'])) + if (! isset($_REQUEST['rid'])) { $_REQUEST['rid'] = null; + } $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(admin_shifts_title(), array( + return page_with_title(admin_shifts_title(), [ msg(), - form(array( + form([ form_select('shifttype_id', _('Shifttype'), $shifttypes, $shifttype_id), form_text('title', _("Title"), $title), form_select('rid', _("Room"), $room_array, $_REQUEST['rid']), - '
', - '
', - 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"), $mode == 'variable', 'variable'), - form_text('change_hours', _("Shift change hours"), ! empty($_REQUEST['change_hours']) ? $_REQUEST['change_hours'] : '00, 04, 08, 10, 12, 14, 16, 18, 20, 22'), - '
', - '
', - form_info(_("Needed angels"), ''), - form_radio('angelmode', _("Take needed angels from room settings"), $angelmode == 'location', 'location'), - form_radio('angelmode', _("The following angels are needed"), $angelmode == 'manually', 'manually'), - '
'.$angel_types.'
', - '
', - '
', + 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_radio('mode', _("Create multiple shifts with variable length"), $mode == 'variable', 'variable'), + form_text('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_radio('angelmode', _("Take needed angels from room settings"), $angelmode == 'location', 'location'), + form_radio('angelmode', _("The following angels are needed"), $angelmode == 'manually', 'manually'), + div('row', [ + $angel_types + ]) + ]) + ]), form_submit('preview', _("Preview")) - )) - )); + ]) + ]); } ?> -- cgit v1.2.3-70-g09d2