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

* CalDAV: fixed parsing of principal urls used by iOS6 for users

Browse Source
This commit is contained in:
Ralf Becker 2012-10-22 16:44:30 +00:00
parent c90fc65566
commit 1517756585
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -972,7 +972,7 @@ class groupdav_principals extends groupdav_handler
*/ */
static public function url2uid($url, $only_type=null) static public function url2uid($url, $only_type=null)
{ {
if (!$only_type) $only_type = array('accounts', 'groups', 'resources', 'locations', 'mailto'); if (!$only_type) $only_type = array('users', 'groups', 'resources', 'locations', 'mailto');
if ($url[0] == '/') if ($url[0] == '/')
{ {
@ -988,7 +988,7 @@ class groupdav_principals extends groupdav_handler
{ {
case 'http': case 'http':
case 'https': case 'https':
list(,$rest) = explode($GLOBALS['egw_info']['server']['webserver_url'].'/groupdav.php/principals/', $url); list(,$rest) = explode('/groupdav.php/principals/', $url);
list($type, $name) = explode('/', $rest); list($type, $name) = explode('/', $rest);
switch($type) switch($type)
{ {
@ -1006,7 +1006,7 @@ class groupdav_principals extends groupdav_handler
case 'mailto': case 'mailto':
if (($uid = $GLOBALS['egw']->accounts->name2id($rest, 'account_email'))) if (($uid = $GLOBALS['egw']->accounts->name2id($rest, 'account_email')))
{ {
$type = $uid > 0 ? 'accounts' : 'groups'; $type = $uid > 0 ? 'users' : 'groups';
break; break;
} }
// search contacts for email // search contacts for email
@ -1037,6 +1037,7 @@ class groupdav_principals extends groupdav_handler
{ {
if ($type == 'accounts') if ($type == 'accounts')
{ {
$type = $id > 0 ? 'users' : 'groups';
$uid = $id; $uid = $id;
} }
else else
@ -1062,6 +1063,7 @@ class groupdav_principals extends groupdav_handler
} }
return false; return false;
} }
//error_log(__METHOD__."('$url', ".array2string($only_type).") uid='$uid', type='$type' --> returning ".array2string($uid && in_array($type, $only_type) ? $uid : false));
return $uid && in_array($type, $only_type) ? $uid : false; return $uid && in_array($type, $only_type) ? $uid : false;
} }