wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Correct calendar loading when calendar are from hooks. fix oc-619

Browse source
This commit is contained in:
Brice Maron 2012-05-10 19:36:30 +00:00
parent 7bc6e86969
commit ffe5ef2268
2 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
apps/calendar/ajax/events.php
View file

@ -12,16 +12,20 @@ require_once('when/When.php');
OCP\JSON::checkLoggedIn(); OCP\JSON::checkLoggedIn();
OCP\JSON::checkAppEnabled('calendar'); OCP\JSON::checkAppEnabled('calendar');
$calendar = OC_Calendar_App::getCalendar($_GET['calendar_id'], false, false); // Look for the calendar id
if(is_numeric($calendar['userid']) && $calendar['userid'] != OCP\User::getUser){ $calendar_id = OC_Calendar_App::getCalendar($_GET['calendar_id'], false, false);
OCP\JSON::error(); if($calendar_id !== false){
exit; 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']);
} }
else {
$start = (version_compare(PHP_VERSION, '5.3.0', '>='))?DateTime::createFromFormat('U', $_GET['start']):new DateTime('@' . $_GET['start']); $calendar_id = $_GET['calendar_id'];
$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);
$events = OC_Calendar_App::getrequestedEvents($calendar['id'], $start, $end);
$output = array(); $output = array();
foreach($events as $event){ foreach($events as $event){

3
apps/calendar/lib/app.php
View file

@ -36,6 +36,9 @@ class OC_Calendar_App{
* @return mixed - bool / array * @return mixed - bool / array
*/ */
public static function getCalendar($id, $security = true, $shared = false){ public static function getCalendar($id, $security = true, $shared = false){
if(! is_numeric($id)){
return false;
}
$calendar = OC_Calendar_Calendar::find($id); $calendar = OC_Calendar_Calendar::find($id);
if($shared === true){ if($shared === true){
if(OC_Calendar_Share::check_access(OCP\USER::getUser(), $id, OC_Calendar_Share::CALENDAR)){ if(OC_Calendar_Share::check_access(OCP\USER::getUser(), $id, OC_Calendar_Share::CALENDAR)){