diff options
| author | Philip Häusler <msquare@notrademark.de> | 2011-07-19 19:12:36 +0200 |
|---|---|---|
| committer | Philip Häusler <msquare@notrademark.de> | 2011-07-19 19:12:36 +0200 |
| commit | 05410ba89afa6ed6dd669528e25c578480e3a67f (patch) | |
| tree | 216df60effc21671bf7740f2ed2bd9cf1b525bfb /includes/pages/user_shifts.php | |
| parent | 32cdb6b0e1d905360f2824444339273f111aff0b (diff) | |
#6 my shifts | cancel my shifts
Diffstat (limited to 'includes/pages/user_shifts.php')
| -rw-r--r-- | includes/pages/user_shifts.php | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/includes/pages/user_shifts.php b/includes/pages/user_shifts.php index 597b652a..64fcbac5 100644 --- a/includes/pages/user_shifts.php +++ b/includes/pages/user_shifts.php @@ -44,15 +44,14 @@ function user_shifts() { } else $user_id = $user['UID']; - // TODO: Kollisionserkennung, andere Schichten zur gleichen Uhrzeit darf der Engel auch nicht belegt haben... $entries = sql_select("SELECT * FROM `ShiftEntry` WHERE `SID`=" . sql_escape($shift['SID'])); foreach ($entries as $entry) if ($entry['UID'] == $user_id) return error("This angel does already have an entry for this shift."); - $comment = strip_request_item_nl($_REQUEST['comment']); - sql_query("INSERT INTO `ShiftEntry` SET `UID`=" . sql_escape($user_id) . ", `TID`=" . sql_escape($type_id) . ", `SID`=" . sql_escape($shift_id)); + $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)); return success("Now it's your shift. Thank you!") . '<a href="' . page_link_to('user_myshifts') . '">View my shifts »</a>'; } @@ -96,7 +95,7 @@ function user_shifts() { $shifts_table = ""; $row_count = 0; foreach ($shifts as $shift) { - $shift_row = '<tr><td>' . date(($id == 0 ? "Y-m-d " : "") . "H:i", $shift['start']) . ' - ' . date("H:i", $shift['end']) .($id == 0 ? "<br />".$shift['Name'] : ""). '</td><td>' . $shift['name'] . '<br />'; + $shift_row = '<tr><td>' . date(($id == 0 ? "Y-m-d " : "") . "H:i", $shift['start']) . ' - ' . date("H:i", $shift['end']) . ($id == 0 ? "<br />" . $shift['Name'] : "") . '</td><td>' . $shift['name'] . '<br />'; $show_shift = false; $angeltypes = sql_select("SELECT * FROM `RoomAngelTypes` JOIN `AngelTypes` ON (`RoomAngelTypes`.`angel_type_id` = `AngelTypes`.`TID`) WHERE `room_id`=" . sql_escape($shift['RID']) . " AND `count` > 0 ORDER BY `AngelTypes`.`Name`"); |