diff options
| -rw-r--r-- | includes/pages/user_ical.php | 24 | ||||
| -rw-r--r-- | includes/pages/user_myshifts.php | 2 | ||||
| -rw-r--r-- | includes/pages/user_shifts.php | 20 |
3 files changed, 24 insertions, 22 deletions
diff --git a/includes/pages/user_ical.php b/includes/pages/user_ical.php index e20f1046..754a4895 100644 --- a/includes/pages/user_ical.php +++ b/includes/pages/user_ical.php @@ -3,7 +3,7 @@ // Öffentlich zugängliche Funktion zum Abrufen von iCal-Exports der eigenen Schichten function user_ical() { - global $ical_shifts; + global $ical_shifts, $user; if (isset ($_REQUEST['key']) && preg_match("/^[0-9a-f]{32}$/", $_REQUEST['key'])) $key = $_REQUEST['key']; @@ -24,18 +24,20 @@ function user_ical() { } header("Content-Type: text/calendar; charset=utf-8"); - echo "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//-//Engelsystem//DE\r\nCALSCALE:GREGORIAN\r\n"; + $html = "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//-//Engelsystem//DE\r\nCALSCALE:GREGORIAN\r\n"; foreach ($ical_shifts as $shift) { - echo "BEGIN:VEVENT\r\n"; - echo "UID:" . md5($shift['start'] . $shift['end'] . $shift['name']) . "\r\n"; - echo "SUMMARY:" . str_replace("\n", "\\n", preg_replace("/[^a-z]*/i", '', $shift['name'])) . "\r\n"; - echo "DESCRIPTION:" . str_replace("\n", "\\n", $shift['Comment']) . "\r\n"; - echo "DTSTART;TZID=Europe/Berlin:" . date("Ymd\THis", $shift['start']) . "\r\n"; - echo "DTEND;TZID=Europe/Berlin:" . date("Ymd\THis", $shift['end']) . "\r\n"; - echo "LOCATION:" . $shift['Name'] . "\r\n"; - echo "END:VEVENT\r\n"; + $html .= "BEGIN:VEVENT\r\n"; + $html .= "UID:" . md5($shift['start'] . $shift['end'] . $shift['name']) . "\r\n"; + $html .= "SUMMARY:" . str_replace("\n", "\\n", $shift['name']) . "\r\n"; + $html .= "DESCRIPTION:" . str_replace("\n", "\\n", $shift['Comment']) . "\r\n"; + $html .= "DTSTART;TZID=Europe/Berlin:" . date("Ymd\THis", $shift['start']) . "\r\n"; + $html .= "DTEND;TZID=Europe/Berlin:" . date("Ymd\THis", $shift['end']) . "\r\n"; + $html .= "LOCATION:" . $shift['Name'] . "\r\n"; + $html .= "END:VEVENT\r\n"; } - echo "END:VCALENDAR\r\n"; + $html .= "END:VCALENDAR\r\n"; + header("Content-Length: " . strlen($html)); + echo $html; die(); } ?> diff --git a/includes/pages/user_myshifts.php b/includes/pages/user_myshifts.php index d144d3f2..fa2c23b7 100644 --- a/includes/pages/user_myshifts.php +++ b/includes/pages/user_myshifts.php @@ -27,7 +27,7 @@ function user_myshifts() { } elseif (isset ($_REQUEST['edit']) && preg_match("/^[0-9]*$/", $_REQUEST['edit'])) { $id = $_REQUEST['edit']; - $shift = sql_select("SELECT `ShiftEntry`.`Comment`, `Shifts`.*, `Room`.`Name`, `AngelTypes`.`name` as `angel_type` FROM `ShiftEntry` JOIN `AngelTypes` ON (`ShiftEntry`.`TID` = `AngelTypes`.`id`) JOIN `Shifts` ON (`ShiftEntry`.`SID` = `Shifts`.`SID`) JOIN `Room` ON (`Shifts`.`RID` = `Room`.`RID`) WHERE `id`=" . sql_escape($id) . " AND `UID`=" . sql_escape($shifts_user['UID']) . " LIMIT 1"); + $shift = sql_select("SELECT `ShiftEntry`.`Comment`, `Shifts`.*, `Room`.`Name`, `AngelTypes`.`name` as `angel_type` FROM `ShiftEntry` JOIN `AngelTypes` ON (`ShiftEntry`.`TID` = `AngelTypes`.`id`) JOIN `Shifts` ON (`ShiftEntry`.`SID` = `Shifts`.`SID`) JOIN `Room` ON (`Shifts`.`RID` = `Room`.`RID`) WHERE `ShiftEntry`.`id`=" . sql_escape($id) . " AND `UID`=" . sql_escape($shifts_user['UID']) . " LIMIT 1"); if (count($shift) > 0) { $shift = $shift[0]; diff --git a/includes/pages/user_shifts.php b/includes/pages/user_shifts.php index a8dda7f3..fe86175d 100644 --- a/includes/pages/user_shifts.php +++ b/includes/pages/user_shifts.php @@ -219,6 +219,7 @@ function view_user_shifts() { global $user, $privileges; global $ical_shifts; + $ical_shifts = array (); $days = sql_select("SELECT DISTINCT DATE(FROM_UNIXTIME(`start`)) AS `id`, DATE(FROM_UNIXTIME(`start`)) AS `name` FROM `Shifts`"); $rooms = sql_select("SELECT `RID` AS `id`, `Name` AS `name` FROM `Room` WHERE `show`='Y' ORDER BY `Name`"); $types = sql_select("SELECT `id`, `name` FROM `AngelTypes`"); @@ -269,10 +270,9 @@ function view_user_shifts() { ); $shifts = sql_select("SELECT * FROM `Shifts` - WHERE `RID` IN (" . implode(',', $_SESSION['user_shifts']['rooms']) . ") - AND DATE(FROM_UNIXTIME(`start`)) IN ('" . implode("','", $_SESSION['user_shifts']['days']) . "') - ORDER BY `start` - "); + WHERE `RID` IN (" . implode(',', $_SESSION['user_shifts']['rooms']) . ") + AND DATE(FROM_UNIXTIME(`start`)) IN ('" . implode("','", $_SESSION['user_shifts']['days']) . "') + ORDER BY `start`"); $shifts_table = ""; $row_count = 0; @@ -284,17 +284,17 @@ function view_user_shifts() { $is_free = false; $shift_has_special_needs = 0 < sql_num_query("SELECT `id` FROM `NeededAngelTypes` WHERE `shift_id` = " . $shift['SID']); $query = "SELECT * - FROM `NeededAngelTypes` - JOIN `AngelTypes` - ON (`NeededAngelTypes`.`angel_type_id` = `AngelTypes`.`id`) - WHERE "; + FROM `NeededAngelTypes` + JOIN `AngelTypes` + ON (`NeededAngelTypes`.`angel_type_id` = `AngelTypes`.`id`) + WHERE "; if ($shift_has_special_needs) $query .= "`shift_id` = " . sql_escape($shift['SID']); else $query .= "`room_id` = " . sql_escape($shift['RID']); $query .= " AND `count` > 0 - AND `angel_type_id` IN (" . implode(',', $_SESSION['user_shifts']['types']) . ") - ORDER BY `AngelTypes`.`name`"; + AND `angel_type_id` IN (" . implode(',', $_SESSION['user_shifts']['types']) . ") + ORDER BY `AngelTypes`.`name`"; $angeltypes = sql_select($query); if (count($angeltypes) > 0) { |