From f62bd8e56b7c07f05de67403dea7f7eb4f846bb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20H=C3=A4usler?= Date: Mon, 3 Dec 2012 21:00:20 +0100 Subject: [PATCH] ical fix --- includes/pages/user_ical.php | 63 ++++++++++++++++++------------------ 1 file changed, 32 insertions(+), 31 deletions(-) diff --git a/includes/pages/user_ical.php b/includes/pages/user_ical.php index 754a4895..2b5632e3 100644 --- a/includes/pages/user_ical.php +++ b/includes/pages/user_ical.php @@ -3,41 +3,42 @@ // Öffentlich zugängliche Funktion zum Abrufen von iCal-Exports der eigenen Schichten function user_ical() { - global $ical_shifts, $user; + global $ical_shifts, $user; - if (isset ($_REQUEST['key']) && preg_match("/^[0-9a-f]{32}$/", $_REQUEST['key'])) - $key = $_REQUEST['key']; - else - die("Missing key."); + if (isset ($_REQUEST['key']) && preg_match("/^[0-9a-f]{32}$/", $_REQUEST['key'])) + $key = $_REQUEST['key']; + else + die("Missing key."); - $user = sql_select("SELECT * FROM `User` WHERE `ical_key`='" . sql_escape($key) . "' LIMIT 1"); - if (count($user) == 0) - die("Key invalid."); + $user = sql_select("SELECT * FROM `User` WHERE `ical_key`='" . sql_escape($key) . "' LIMIT 1"); + if (count($user) == 0) + die("Key invalid."); - $user = $user[0]; + $user = $user[0]; - if (isset ($_REQUEST['export']) && $_REQUEST['export'] == 'user_shifts') { - require_once ('includes/pages/user_shifts.php'); - view_user_shifts(); - } else { - $ical_shifts = sql_select("SELECT * FROM `ShiftEntry` JOIN `Shifts` ON (`ShiftEntry`.`SID` = `Shifts`.`SID`) JOIN `Room` ON (`Shifts`.`RID` = `Room`.`RID`) WHERE `UID`=" . sql_escape($user['UID']) . " ORDER BY `start`"); - } + if (isset ($_REQUEST['export']) && $_REQUEST['export'] == 'user_shifts') { + require_once ('includes/pages/user_shifts.php'); + view_user_shifts(); + } else { + $ical_shifts = sql_select("SELECT `Shifts`.*, `Room`.`Name` as `room_name` FROM `ShiftEntry` INNER JOIN `Shifts` ON (`ShiftEntry`.`SID` = `Shifts`.`SID`) INNER JOIN `Room` ON (`Shifts`.`RID` = `Room`.`RID`) WHERE `UID`=" . sql_escape($user['UID']) . " ORDER BY `start`"); + } - header("Content-Type: text/calendar; charset=utf-8"); - $html = "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//-//Engelsystem//DE\r\nCALSCALE:GREGORIAN\r\n"; - foreach ($ical_shifts as $shift) { - $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"; - } - $html .= "END:VCALENDAR\r\n"; - header("Content-Length: " . strlen($html)); - echo $html; - die(); + header("Content-Type: text/calendar; charset=utf-8"); + $html = "BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//-//Engelsystem//DE\r\nCALSCALE:GREGORIAN\r\n"; + foreach ($ical_shifts as $shift) { + $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"; + if(isset($shift['Comment'])) + $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['room_name'] . "\r\n"; + $html .= "END:VEVENT\r\n"; + } + $html .= "END:VCALENDAR\r\n"; + header("Content-Length: " . strlen($html)); + echo $html; + die(); } ?>