extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-25 12:22:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

* support multiget report on url with uid, as lightning uses multiget after a PUT on the PUT url, which is the uid

Browse Source
This commit is contained in:
Ralf Becker 2010-11-08 09:25:58 +00:00
parent 33a0f786bd
commit 0571fc21e0
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
calendar/inc/class.calendar_groupdav.inc.php
View File

@ -24,14 +24,14 @@ class calendar_groupdav extends groupdav_handler
* @var calendar_boupdate * @var calendar_boupdate
*/ */
var $bo; var $bo;
/** /**
* vCalendar Instance for parsing * vCalendar Instance for parsing
* *
* @var array * @var array
*/ */
var $vCalendar; var $vCalendar;
var $filter_prop2cal = array( var $filter_prop2cal = array(
'SUMMARY' => 'cal_title', 'SUMMARY' => 'cal_title',
'UID' => 'cal_uid', 'UID' => 'cal_uid',
@ -354,7 +354,16 @@ error_log(__METHOD__."($path,,".array2string($start).") filter=".array2string($f
if ($option['name'] == 'href') if ($option['name'] == 'href')
{ {
$parts = explode('/',$option['data']); $parts = explode('/',$option['data']);
if (is_numeric($id = basename(array_pop($parts),'.ics'))) $ids[] = $id; if (!($id = basename(array_pop($parts),'.ics'))) continue;
if (is_numeric($id))
{
$ids[] = $id;
}
else // eg. lightning uses multiget after a PUT on the PUT url, which is the uid
{
$cal_filters['query']['cal_uid'][] = $id;
}
} }
} }
} }
@ -363,7 +372,7 @@ error_log(__METHOD__."($path,,".array2string($start).") filter=".array2string($f
$cal_filters['query'][] = 'egw_cal.cal_id IN ('.implode(',',array_map(create_function('$n','return (int)$n;'),$ids)).')'; $cal_filters['query'][] = 'egw_cal.cal_id IN ('.implode(',',array_map(create_function('$n','return (int)$n;'),$ids)).')';
} }
if ($this->debug > 1) error_log(__FILE__ . __METHOD__ ."($options[path],...,$id) calendar-multiget: ids=".implode(',',$ids)); if ($this->debug > 1) error_log(__FILE__ . __METHOD__ ."($options[path],...,$id) calendar-multiget: ids=".implode(',',$ids).', cal_filters='.array2string($cal_filters));
} }
return true; return true;
} }