diff options
author | msquare <msquare@notrademark.de> | 2016-09-29 11:18:17 +0200 |
---|---|---|
committer | msquare <msquare@notrademark.de> | 2016-09-29 11:18:17 +0200 |
commit | e965f8d04150fbd17ee1b5fcbca5ae85bbe6d6bd (patch) | |
tree | f610d047f1cdc830ffc34881f6ea6d26ef0e3983 /includes/view/User_view.php | |
parent | 91dafb19ec171e747d9976cf738606759bde3aae (diff) |
prohibit inline control structures on model and view
Diffstat (limited to 'includes/view/User_view.php')
-rw-r--r-- | includes/view/User_view.php | 141 |
1 files changed, 77 insertions, 64 deletions
diff --git a/includes/view/User_view.php b/includes/view/User_view.php index 4f61006e..5c258fc7 100644 --- a/includes/view/User_view.php +++ b/includes/view/User_view.php @@ -3,7 +3,7 @@ /** * Available T-Shirt sizes */ -$tshirt_sizes = array( +$tshirt_sizes = [ '' => _("Please select..."), 'S' => "S", 'M' => "M", @@ -17,7 +17,7 @@ $tshirt_sizes = array( 'M-G' => "M Girl", 'L-G' => "L Girl", 'XL-G' => "XL Girl" -); +]; /** * Displays the welcome message to the user and shows a login form. @@ -112,12 +112,12 @@ function Users_view($users, $order_by, $arrived_count, $active_count, $force_act 'actions' => '<strong>' . count($users) . '</strong>' ); - return page_with_title(_('All users'), array( + return page_with_title(_('All users'), [ msg(), - buttons(array( + buttons([ button(page_link_to('register'), glyph('plus') . _('New user')) - )), - table(array( + ]), + table([ 'Nick' => Users_table_header_link('Nick', _('Nick'), $order_by), 'Vorname' => Users_table_header_link('Vorname', _('Prename'), $order_by), 'Name' => Users_table_header_link('Name', _('Name'), $order_by), @@ -131,8 +131,8 @@ function Users_view($users, $order_by, $arrived_count, $active_count, $force_act 'Size' => Users_table_header_link('Size', _('Size'), $order_by), 'lastLogIn' => Users_table_header_link('lastLogIn', _('Last login'), $order_by), 'actions' => '' - ), $users) - )); + ], $users) + ]); } function Users_table_header_link($column, $label, $order_by) { @@ -141,24 +141,28 @@ function Users_table_header_link($column, $label, $order_by) { function User_shift_state_render($user) { $upcoming_shifts = ShiftEntries_upcoming_for_user($user); - if ($upcoming_shifts === false) + if ($upcoming_shifts === false) { return false; + } - if (count($upcoming_shifts) == 0) + if (count($upcoming_shifts) == 0) { return '<span class="text-success">' . _("Free") . '</span>'; + } - if ($upcoming_shifts[0]['start'] > time()) - if ($upcoming_shifts[0]['start'] - time() > 3600) + if ($upcoming_shifts[0]['start'] > time()) { + if ($upcoming_shifts[0]['start'] - time() > 3600) { return '<span class="text-success moment-countdown" data-timestamp="' . $upcoming_shifts[0]['start'] . '">' . _("Next shift %c") . '</span>'; - else + } else { return '<span class="text-warning moment-countdown" data-timestamp="' . $upcoming_shifts[0]['start'] . '">' . _("Next shift %c") . '</span>'; - + } + } $halfway = ($upcoming_shifts[0]['start'] + $upcoming_shifts[0]['end']) / 2; - if (time() < $halfway) + if (time() < $halfway) { return '<span class="text-danger moment-countdown" data-timestamp="' . $upcoming_shifts[0]['start'] . '">' . _("Shift starts %c") . '</span>'; - else + } else { return '<span class="text-danger moment-countdown" data-timestamp="' . $upcoming_shifts[0]['end'] . '">' . _("Shift ends %c") . '</span>'; + } } function User_view($user_source, $admin_user_privilege, $freeloader, $user_angeltypes, $user_groups, $shifts, $its_me) { @@ -166,76 +170,83 @@ function User_view($user_source, $admin_user_privilege, $freeloader, $user_angel $user_name = htmlspecialchars($user_source['Vorname']) . " " . htmlspecialchars($user_source['Name']); - $myshifts_table = array(); + $myshifts_table = []; $timesum = 0; foreach ($shifts as $shift) { $shift_info = '<a href="' . shift_link($shift) . '">' . $shift['name'] . '</a>'; - if ($shift['title']) + if ($shift['title']) { $shift_info .= '<br /><a href="' . shift_link($shift) . '">' . $shift['title'] . '</a>'; + } foreach ($shift['needed_angeltypes'] as $needed_angel_type) { $shift_info .= '<br><b>' . $needed_angel_type['name'] . ':</b> '; - $shift_entries = array(); + $shift_entries = []; foreach ($needed_angel_type['users'] as $user_shift) { $member = User_Nick_render($user_shift); - if ($user_shift['freeloaded']) + if ($user_shift['freeloaded']) { $member = '<strike>' . $member . '</strike>'; + } $shift_entries[] = $member; } $shift_info .= join(", ", $shift_entries); } - $myshift = array( + $myshift = [ 'date' => date("Y-m-d", $shift['start']), 'time' => date("H:i", $shift['start']) . ' - ' . date("H:i", $shift['end']), 'room' => $shift['Name'], 'shift_info' => $shift_info, 'comment' => $shift['Comment'] - ); + ]; if ($shift['freeloaded']) { - if (in_array("user_shifts_admin", $privileges)) + if (in_array("user_shifts_admin", $privileges)) { $myshift['comment'] .= '<br /><p class="error">' . _("Freeloaded") . ': ' . $shift['freeload_comment'] . '</p>'; - else + } else { $myshift['comment'] .= '<br /><p class="error">' . _("Freeloaded") . '</p>'; + } } $myshift['actions'] = [ button(shift_link($shift), glyph('eye-open') . _('view'), 'btn-xs') ]; - if ($its_me || in_array('user_shifts_admin', $privileges)) + if ($its_me || in_array('user_shifts_admin', $privileges)) { $myshift['actions'][] = button(page_link_to('user_myshifts') . '&edit=' . $shift['id'] . '&id=' . $user_source['UID'], glyph('edit') . _('edit'), 'btn-xs'); - if (($shift['start'] > time() + $LETZTES_AUSTRAGEN * 3600) || in_array('user_shifts_admin', $privileges)) + } + if (($shift['start'] > time() + $LETZTES_AUSTRAGEN * 3600) || in_array('user_shifts_admin', $privileges)) { $myshift['actions'][] = button(page_link_to('user_myshifts') . ((! $its_me) ? '&id=' . $user_source['UID'] : '') . '&cancel=' . $shift['id'], glyph('trash') . _('sign off'), 'btn-xs'); + } $myshift['actions'] = table_buttons($myshift['actions']); - if ($shift['freeloaded']) + if ($shift['freeloaded']) { $timesum += (- 2 * ($shift['end'] - $shift['start'])); - else + } else { $timesum += ($shift['end'] - $shift['start']); + } $myshifts_table[] = $myshift; } - if (count($myshifts_table) > 0) - $myshifts_table[] = array( + if (count($myshifts_table) > 0) { + $myshifts_table[] = [ 'date' => '<b>' . _("Sum:") . '</b>', 'time' => "<b>" . round($timesum / 3600, 1) . " h</b>", 'room' => "", 'shift_info' => "", 'comment' => "", 'actions' => "" - ); + ]; + } - return page_with_title('<span class="icon-icon_angel"></span> ' . htmlspecialchars($user_source['Nick']) . ' <small>' . $user_name . '</small>', array( + return page_with_title('<span class="icon-icon_angel"></span> ' . htmlspecialchars($user_source['Nick']) . ' <small>' . $user_name . '</small>', [ msg(), - div('row', array( - div('col-md-3', array( + div('row', [ + div('col-md-3', [ '<h1>', '<span class="glyphicon glyphicon-phone"></span>', $user_source['DECT'], '</h1>' - )), - div('col-md-3', array( + ]), + div('col-md-3', [ '<h4>' . _("User state") . '</h4>', ($admin_user_privilege && $freeloader) ? '<span class="text-danger"><span class="glyphicon glyphicon-exclamation-sign"></span> ' . _("Freeloader") . '</span><br />' : '', $user_source['Gekommen'] ? User_shift_state_render($user_source) . '<br />' : '', @@ -243,19 +254,19 @@ function User_view($user_source, $admin_user_privilege, $freeloader, $user_angel $admin_user_privilege ? ($user_source['got_voucher'] > 0 ? '<br /><span class="text-success">' . glyph('cutlery') . sprintf(ngettext("Got %s voucher", "Got %s vouchers", $user_source['got_voucher']), $user_source['got_voucher']) . '</span><br />' : '<br /><span class="text-danger">' . _("Got no vouchers") . '</span><br />') : '', ($user_source['Gekommen'] && $admin_user_privilege && $user_source['Aktiv']) ? ' <span class="text-success">' . _("Active") . '</span>' : '', ($user_source['Gekommen'] && $admin_user_privilege && $user_source['Tshirt']) ? ' <span class="text-success">' . _("T-Shirt") . '</span>' : '' - )), - div('col-md-3', array( + ]), + div('col-md-3', [ '<h4>' . _("Angeltypes") . '</h4>', User_angeltypes_render($user_angeltypes) - )), - div('col-md-3', array( + ]), + div('col-md-3', [ '<h4>' . _("Rights") . '</h4>', User_groups_render($user_groups) - )) - )), - div('row space-top', array( - div('col-md-12', array( - buttons(array( + ]) + ]), + div('row space-top', [ + div('col-md-12', [ + buttons([ $admin_user_privilege ? button(page_link_to('admin_user') . '&id=' . $user_source['UID'], glyph("edit") . _("edit")) : '', $admin_user_privilege ? button(user_driver_license_edit_link($user_source), glyph("road") . _("driving license")) : '', ($admin_user_privilege && ! $user_source['Gekommen']) ? button(page_link_to('admin_arrive') . '&arrived=' . $user_source['UID'], _("arrived")) : '', @@ -264,63 +275,65 @@ function User_view($user_source, $admin_user_privilege, $freeloader, $user_angel $its_me ? button(page_link_to('ical') . '&key=' . $user_source['api_key'], glyph('calendar') . _("iCal Export")) : '', $its_me ? button(page_link_to('shifts_json_export') . '&key=' . $user_source['api_key'], glyph('export') . _("JSON Export")) : '', $its_me ? button(page_link_to('user_myshifts') . '&reset', glyph('repeat') . _('Reset API key')) : '' - )) - )) - )), + ]) + ]) + ]), ($its_me || $admin_user_privilege) ? '<h2>' . _("Shifts") . '</h2>' : '', - ($its_me || $admin_user_privilege) ? table(array( + ($its_me || $admin_user_privilege) ? table([ 'date' => _("Day"), 'time' => _("Time"), 'room' => _("Location"), 'shift_info' => _("Name & workmates"), 'comment' => _("Comment"), 'actions' => _("Action") - ), $myshifts_table) : '', + ], $myshifts_table) : '', $its_me ? info(glyph('info-sign') . _("Your night shifts between 2 and 8 am count twice."), true) : '', $its_me && count($shifts) == 0 ? error(sprintf(_("Go to the <a href=\"%s\">shifts table</a> to sign yourself up for some shifts."), page_link_to('user_shifts')), true) : '' - )); + ]); } /** * View for password recovery step 1: E-Mail */ function User_password_recovery_view() { - return page_with_title(user_password_recovery_title(), array( + return page_with_title(user_password_recovery_title(), [ msg(), _("We will send you an e-mail with a password recovery link. Please use the email address you used for registration."), - form(array( + form([ form_text('email', _("E-Mail"), ""), form_submit('submit', _("Recover")) - )) - )); + ]) + ]); } /** * View for password recovery step 2: New password */ function User_password_set_view() { - return page_with_title(user_password_recovery_title(), array( + return page_with_title(user_password_recovery_title(), [ msg(), _("Please enter a new password."), - form(array( + form([ form_password('password', _("Password")), form_password('password2', _("Confirm password")), form_submit('submit', _("Save")) - )) - )); + ]) + ]); } function User_angeltypes_render($user_angeltypes) { - $output = array(); + $output = []; foreach ($user_angeltypes as $angeltype) { $class = ""; - if ($angeltype['restricted'] == 1) - if ($angeltype['confirm_user_id'] != null) + if ($angeltype['restricted'] == 1) { + if ($angeltype['confirm_user_id'] != null) { $class = 'text-success'; - else + } else { $class = 'text-warning'; - else + } + } else { $class = 'text-success'; + } $output[] = '<a href="' . angeltype_link($angeltype['id']) . '" class="' . $class . '">' . ($angeltype['coordinator'] ? glyph('education') : '') . $angeltype['name'] . '</a>'; } return join('<br />', $output); |