mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-02-05 04:50:13 +01:00
if client set an own filter, reset the open-standard filter
This commit is contained in:
parent
b2ea1a7d05
commit
e9f4f4f3b3
@ -262,6 +262,8 @@ class infolog_groupdav extends groupdav_handler
|
|||||||
{
|
{
|
||||||
if ($options['filters'])
|
if ($options['filters'])
|
||||||
{
|
{
|
||||||
|
$cal_filters_in = $cal_filters; // remember filter, to be able to reset standard open-filter, if client sets own filters
|
||||||
|
|
||||||
foreach($options['filters'] as $filter)
|
foreach($options['filters'] as $filter)
|
||||||
{
|
{
|
||||||
switch($filter['name'])
|
switch($filter['name'])
|
||||||
@ -298,13 +300,18 @@ class infolog_groupdav extends groupdav_handler
|
|||||||
if ($this->debug) error_log(__METHOD__."($options[path],...) param-filter='{$filter['attrs']['name']}' not (yet) implemented!");
|
if ($this->debug) error_log(__METHOD__."($options[path],...) param-filter='{$filter['attrs']['name']}' not (yet) implemented!");
|
||||||
break;
|
break;
|
||||||
case 'time-range':
|
case 'time-range':
|
||||||
$cal_filters[] = $sql = $this->_time_range_filter($filter['attrs']);
|
$cal_filters[] = $this->_time_range_filter($filter['attrs']);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
if ($this->debug) error_log(__METHOD__."($options[path],".array2string($options).",...) unknown filter --> ignored");
|
if ($this->debug) error_log(__METHOD__."($options[path],".array2string($options).",...) unknown filter --> ignored");
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// if client set an own filter, reset the open-standard filter
|
||||||
|
if ($cal_filters != $cal_filters_in)
|
||||||
|
{
|
||||||
|
$cal_filters['filter'] = str_replace(array('open', 'open-user'), array('own', 'user'), $cal_filters['filter']);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
// multiget or propfind on a given id
|
// multiget or propfind on a given id
|
||||||
//error_log(__FILE__ . __METHOD__ . "multiget of propfind:");
|
//error_log(__FILE__ . __METHOD__ . "multiget of propfind:");
|
||||||
|
Loading…
Reference in New Issue
Block a user