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

Merge branch 'master' of https://vcs.wybt.net/engelsystem/git

This commit is contained in:
Jan-Philipp Litza 2011-09-14 23:11:34 +02:00
parent 01bd4e33de 95e9e7b147
commit 2ad0124eb0
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
includes/pages/admin_news.php
View File

@ -75,7 +75,7 @@ function admin_news() {
if (count($news) > 0) { if (count($news) > 0) {
list ($news) = $news; list ($news) = $news;
sql_query("DELETE FROM `news` WHERE `ID`=" . sql_escape($id) . " LIMIT 1"); sql_query("DELETE FROM `News` WHERE `ID`=" . sql_escape($id) . " LIMIT 1");
header("Location: " . page_link_to("news")); header("Location: " . page_link_to("news"));
} else } else
return error("No News found."); return error("No News found.");

12
includes/pages/user_shifts.php
View File

@ -8,7 +8,7 @@ function user_shifts() {
header("Location: " . page_link_to('user_shifts')); header("Location: " . page_link_to('user_shifts'));
sql_query("DELETE FROM `ShiftEntry` WHERE `id`=" . sql_escape($entry_id) . " LIMIT 1"); sql_query("DELETE FROM `ShiftEntry` WHERE `id`=" . sql_escape($entry_id) . " LIMIT 1");
return success("The shift entry has been deleted."); return success("Der Schicht-Eintrag wurde gelöscht..");
} }
// Schicht komplett löschen (nur für admins/user mit user_shifts_admin privileg) // 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)) { elseif (isset ($_REQUEST['delete_shift']) && in_array('user_shifts_admin', $privileges)) {
@ -80,7 +80,7 @@ function user_shifts() {
$comment = strip_request_item_nl('comment'); $comment = strip_request_item_nl('comment');
sql_query("INSERT INTO `ShiftEntry` SET `Comment`='" . sql_escape($comment) . "', `UID`=" . sql_escape($user_id) . ", `TID`=" . sql_escape($type_id) . ", `SID`=" . sql_escape($shift_id)); sql_query("INSERT INTO `ShiftEntry` SET `Comment`='" . sql_escape($comment) . "', `UID`=" . sql_escape($user_id) . ", `TID`=" . sql_escape($type_id) . ", `SID`=" . sql_escape($shift_id));
return success("Now it's your shift. Thank you!") . '<a href="' . page_link_to('user_myshifts') . '">View my shifts &raquo;</a>'; return success("Du bist eingetragen. Danke!") . '<a href="' . page_link_to('user_myshifts') . '">Meine Schichten &raquo;</a>';
} }
if (in_array('user_shifts_admin', $privileges)) { if (in_array('user_shifts_admin', $privileges)) {
@ -148,10 +148,10 @@ function user_shifts() {
} }
if ($angeltype['count'] - count($entries) > 0) if ($angeltype['count'] - count($entries) > 0)
if (!$my_shift || in_array('user_shifts_admin', $privileges)) { if (!$my_shift || in_array('user_shifts_admin', $privileges)) {
$entry_list[] = '<a href="' . page_link_to('user_shifts') . '&shift_id=' . $shift['SID'] . '&type_id=' . $angeltype['TID'] . '">' . ($angeltype['count'] - count($entries)) . ' angel' . ($angeltype['count'] - count($entries) != 1 ? 's' : '') . ' missing &raquo;</a>'; $entry_list[] = '<a href="' . page_link_to('user_shifts') . '&shift_id=' . $shift['SID'] . '&type_id=' . $angeltype['TID'] . '">' . ($angeltype['count'] - count($entries)) . ' Helfer' . ($angeltype['count'] - count($entries) != 1 ? '' : '') . ' gebraucht &raquo;</a>';
$show_shift = true; $show_shift = true;
} else } else
$entry_list[] = ($angeltype['count'] - count($entries)) . ' angel missing'; $entry_list[] = ($angeltype['count'] - count($entries)) . ' Helfer gebraucht';
$shift_row .= '<b>' . $angeltype['Name'] . ':</b> '; $shift_row .= '<b>' . $angeltype['Name'] . ':</b> ';
$shift_row .= join(", ", $entry_list); $shift_row .= join(", ", $entry_list);
@ -191,9 +191,9 @@ function make_room_select($rooms, $id, $day) {
$html[] = '<a href="' . page_link_to('user_shifts') . '&room_id=' . $room['RID'] . '&day=' . $day . '">' . $room['Name'] . '</a>'; $html[] = '<a href="' . page_link_to('user_shifts') . '&room_id=' . $room['RID'] . '&day=' . $day . '">' . $room['Name'] . '</a>';
} }
if ($id == 0) if ($id == 0)
$html[] = '<b>Next 15 free shifts</b>'; $html[] = '<b>Nächste freie Schichten</b>';
else else
$html[] = '<a href="' . page_link_to('user_shifts') . '&room_id=0">Next 15 free shifts</a>'; $html[] = '<a href="' . page_link_to('user_shifts') . '&room_id=0">Nächste freie Schichten</a>';
return join(' | ', $html); return join(' | ', $html);
} }
?> ?>

8
templates/user_shifts.html
View File

@ -1,17 +1,17 @@
<p> <p>
Select room: %room_select% Raum: %room_select%
</p> </p>
<p> <p>
Select day: %day_select% Tag: %day_select%
</p> </p>
<table> <table>
<thead> <thead>
<tr> <tr>
<th> <th>
Timeslot Zeit
</th> </th>
<th> <th>
Entries Einträge
</th> </th>
</tr> </tr>
</thead> </thead>