iger
/
engelsystem
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix remembering of new-style-setting and fix a bug with signing up for shifts after they startet

This commit is contained in:
Jan-Philipp Litza 2012-12-28 03:53:08 +01:00
parent 378d524fbd
commit cc8f117ed1
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
includes/pages/user_shifts.php
View File

@ -324,9 +324,13 @@ function view_user_shifts() {
$_SESSION['user_shifts'][$key] = array_map('get_ids_from_array', $$key); $_SESSION['user_shifts'][$key] = array_map('get_ids_from_array', $$key);
} }
if (!isset($_REQUEST['new_style'])) if (isset($_REQUEST['rooms'])) {
$_SESSION['user_shifts']['new_style'] = false; 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']))
$_SESSION['user_shifts']['new_style'] = true; $_SESSION['user_shifts']['new_style'] = true;
if (isset ($_REQUEST['days'])) { if (isset ($_REQUEST['days'])) {
@ -488,7 +492,7 @@ function view_user_shifts() {
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>'; $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']) { if(time() > $shift['start']) {
$entry_list[] = $inner_text . ' (vorbei)'; $entry_list[] = $inner_text . ' (vorbei)';
} 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 . ' <img src="pic/lock.png" alt="unconfirmed" title="Du bist für diesen Engeltyp noch nicht freigeschaltet." />'; $entry_list[] = $inner_text . ' <img src="pic/lock.png" alt="unconfirmed" title="Du bist für diesen Engeltyp noch nicht freigeschaltet." />';