extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-03 04:29:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

missed to commit parameter to parse CN from url

Browse Source
This commit is contained in:
Ralf Becker 2014-03-25 12:22:00 +00:00
parent 659ad40b50
commit 9a10af6fe5
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -973,9 +973,10 @@ class groupdav_principals extends groupdav_handler
* *
* @param string $url * @param string $url
* @param string|array $only_type=null allowed types, return false for other (valid) types, eg. "users", "groups" or "resources", default all * @param string|array $only_type=null allowed types, return false for other (valid) types, eg. "users", "groups" or "resources", default all
* @param string $cn=null common name to be stored in case of an "e" uid
* @return int|string|boolean integer account_id, string calendar uid or false if not a supported uid * @return int|string|boolean integer account_id, string calendar uid or false if not a supported uid
*/ */
static public function url2uid($url, $only_type=null) static public function url2uid($url, $only_type=null, $cn=null)
{ {
if (!$only_type) $only_type = array('users', 'groups', 'resources', 'locations', 'mailto'); if (!$only_type) $only_type = array('users', 'groups', 'resources', 'locations', 'mailto');
@ -1026,7 +1027,7 @@ class groupdav_principals extends groupdav_handler
} }
else // just store email-address else // just store email-address
{ {
$uid = 'e'.$rest; $uid = $cn && $rest[0] != '<' && $cn != $rest ? 'e'.$cn.' <'.$rest.'>' : 'e'.$rest;
$type = 'users'; $type = 'users';
} }
break; break;