extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-26 09:53:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

"KAddressbook still has problem with self URL in propfind of /addressbook/ collection contains GroupDAV resourcetype, disabling it only for KAddressbook "

Browse Source
This commit is contained in:
Ralf Becker 2008-07-08 05:52:04 +00:00
parent f108dea1cb
commit 510f9baf94
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
phpgwapi/inc/class.groupdav.inc.php
View File

@ -108,7 +108,6 @@ class groupdav extends HTTP_WebDAV_Server
function OPTIONS($path, &$dav, &$allow) function OPTIONS($path, &$dav, &$allow)
{ {
list(,$app) = explode('/',$path); list(,$app) = explode('/',$path);
switch($app) switch($app)
{ {
case 'calendar': case 'calendar':
@ -206,8 +205,8 @@ class groupdav extends HTTP_WebDAV_Server
'path' => '/'.$app.'/', 'path' => '/'.$app.'/',
'props' => $handler->extra_properties(array( 'props' => $handler->extra_properties(array(
self::mkprop('displayname',$this->translation->convert(lang($app),$this->egw_charset,'utf-8')), self::mkprop('displayname',$this->translation->convert(lang($app),$this->egw_charset,'utf-8')),
// Kontact doubles the folder, if the self URL contains the GroupDAV/CalDAV resourcetypes // KAddressbook doubles the folder, if the self URL contains the GroupDAV/CalDAV resourcetypes
self::mkprop('resourcetype', $this->_resourcetype($app,strpos($_SERVER['HTTP_USER_AGENT'],'KHTML') !== false)), self::mkprop('resourcetype', $this->_resourcetype($app,$app=='addressbook'&&strpos($_SERVER['HTTP_USER_AGENT'],'KHTML') !== false)),
)), )),
); );
} }
@ -224,7 +223,7 @@ class groupdav extends HTTP_WebDAV_Server
* Return resourcetype(s) for a given app * Return resourcetype(s) for a given app
* *
* @param string $app * @param string $app
* @param boolean $no_extra_types=false should the GroupDAV and CalDAV types be added (Kontact has problems with it in self URL) * @param boolean $no_extra_types=false should the GroupDAV and CalDAV types be added (KAddressbook has problems with it in self URL)
* @return array or DAV properties generated via * @return array or DAV properties generated via
*/ */
function _resourcetype($app,$no_extra_types=false) function _resourcetype($app,$no_extra_types=false)
@ -239,6 +238,7 @@ class groupdav extends HTTP_WebDAV_Server
$resourcetype[] = self::mkprop($ns,'resourcetype', $type); $resourcetype[] = self::mkprop($ns,'resourcetype', $type);
} }
} }
//error_log(__METHOD__."($app,$no_extra_types)=".array2string($resourcetype));
return $resourcetype; return $resourcetype;
} }