extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-05 13:39:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

using / as calendar-home-set and fixed return code for PUT requests on the UID

Browse Source
This commit is contained in:
Ralf Becker 2008-05-10 20:12:20 +00:00
parent 6ca9cecf01
commit ce59f97204
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -262,8 +262,9 @@ class calendar_groupdav extends groupdav_handler
} }
header('ETag: '.$this->get_etag($cal_id)); header('ETag: '.$this->get_etag($cal_id));
if (is_null($event) || $id != $cal_id) if (is_null($event))
{ {
error_log(__METHOD__."(,$id,$user) cal_id=$cal_id, is_null(\$event)=".(int)is_null($event));
header('Location: '.$this->base_uri.'/calendar/'.$cal_id); header('Location: '.$this->base_uri.'/calendar/'.$cal_id);
return '201 Created'; return '201 Created';
} }
@ -313,7 +314,7 @@ class calendar_groupdav extends groupdav_handler
// add a hash over the participants and their stati // add a hash over the participants and their stati
ksort($entry['participants']); // create a defined order ksort($entry['participants']); // create a defined order
$etag .= ':'.md5(serialize($entry['participants'])); $etag .= ':'.md5(serialize($entry['participants']));
//error_log(__METHOD__."($entry[id]: $entry[title])=$etag"); //error_log(__METHOD__."($entry[id] ($entry[etag]): $entry[title] --> etag=$etag");
return $etag; return $etag;
} }
@ -338,9 +339,9 @@ class calendar_groupdav extends groupdav_handler
static function extra_properties(array $props=array()) static function extra_properties(array $props=array())
{ {
// calendaring URL of the current user // calendaring URL of the current user
$props[] = HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'calendar-home-set',$_SERVER['SCRIPT_NAME'].'/calendar/'); $props[] = HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'calendar-home-set',$_SERVER['SCRIPT_NAME'].'/');
// email of the current user, see caldav-sheduling draft // email of the current user, see caldav-sheduling draft
$props[] = HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'calendar-user-address-set','mailto:'.$GLOBALS['egw_info']['user']['email']); $props[] = HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'calendar-user-address-set','MAILTO:'.$GLOBALS['egw_info']['user']['email']);
return $props; return $props;
} }