diff options
| author | Brice Maron <brice@bmaron.net> | 2012-05-10 19:36:30 +0000 |
|---|---|---|
| committer | Brice Maron <brice@bmaron.net> | 2012-05-10 19:36:30 +0000 |
| commit | ffe5ef2268bb4732670f231832b4e0b04e8400e2 (patch) | |
| tree | a72a77342b5974892dff5450e62f4998c061fad3 /apps/calendar/ajax/events.php | |
| parent | 7bc6e869696c446f2d8a75c89b5db74de8a38960 (diff) | |
| download | nextcloud-server-ffe5ef2268bb4732670f231832b4e0b04e8400e2.tar.gz nextcloud-server-ffe5ef2268bb4732670f231832b4e0b04e8400e2.zip | |
Correct calendar loading when calendar are from hooks. fix oc-619
Diffstat (limited to 'apps/calendar/ajax/events.php')
| -rwxr-xr-x | apps/calendar/ajax/events.php | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/apps/calendar/ajax/events.php b/apps/calendar/ajax/events.php index afb4d61d315..0618c0f3fdf 100755 --- a/apps/calendar/ajax/events.php +++ b/apps/calendar/ajax/events.php @@ -12,16 +12,20 @@ require_once('when/When.php'); OCP\JSON::checkLoggedIn(); OCP\JSON::checkAppEnabled('calendar'); -$calendar = OC_Calendar_App::getCalendar($_GET['calendar_id'], false, false); -if(is_numeric($calendar['userid']) && $calendar['userid'] != OCP\User::getUser){ - OCP\JSON::error(); - exit; +// Look for the calendar id +$calendar_id = OC_Calendar_App::getCalendar($_GET['calendar_id'], false, false); +if($calendar_id !== false){ + if(! is_numeric($calendar['userid']) && $calendar['userid'] != OCP\User::getUser()){ + OCP\JSON::error(); + exit; + } + $start = (version_compare(PHP_VERSION, '5.3.0', '>='))?DateTime::createFromFormat('U', $_GET['start']):new DateTime('@' . $_GET['start']); + $end = (version_compare(PHP_VERSION, '5.3.0', '>='))?DateTime::createFromFormat('U', $_GET['end']):new DateTime('@' . $_GET['end']); } - -$start = (version_compare(PHP_VERSION, '5.3.0', '>='))?DateTime::createFromFormat('U', $_GET['start']):new DateTime('@' . $_GET['start']); -$end = (version_compare(PHP_VERSION, '5.3.0', '>='))?DateTime::createFromFormat('U', $_GET['end']):new DateTime('@' . $_GET['end']); - -$events = OC_Calendar_App::getrequestedEvents($calendar['id'], $start, $end); +else { + $calendar_id = $_GET['calendar_id']; +} +$events = OC_Calendar_App::getrequestedEvents($calendar_id, $start, $end); $output = array(); foreach($events as $event){ |