mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix odd behaviour

This commit is contained in:
Morris Jobke 2014-10-31 18:46:47 +01:00
parent fe9e6be35c
commit 56cf1d9d27
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/private/connector/sabre/principal.php
View File

@ -28,15 +28,17 @@ class OC_Connector_Sabre_Principal implements \Sabre\DAVACL\PrincipalBackend\Bac
foreach(OC_User::getUsers() as $user) { foreach(OC_User::getUsers() as $user) {
$user_uri = 'principals/'.$user; $user_uri = 'principals/'.$user;
$principals[] = array( $principal = array(
'uri' => $user_uri, 'uri' => $user_uri,
'{DAV:}displayname' => $user, '{DAV:}displayname' => $user,
); );
$email= \OCP\Config::getUserValue($user, 'settings', 'email'); $email= \OCP\Config::getUserValue($user, 'settings', 'email');
if($email) { if($email) {
$principals['{http://sabredav.org/ns}email-address'] = $email; $principal['{http://sabredav.org/ns}email-address'] = $email;
} }
$principals[] = $principal;
} }
} }
@ -56,15 +58,17 @@ class OC_Connector_Sabre_Principal implements \Sabre\DAVACL\PrincipalBackend\Bac
if ($prefix == 'principals' && OC_User::userExists($name)) { if ($prefix == 'principals' && OC_User::userExists($name)) {
return array( $principal = array(
'uri' => 'principals/'.$name, 'uri' => 'principals/'.$name,
'{DAV:}displayname' => $name, '{DAV:}displayname' => $name,
); );
$email= \OCP\Config::getUserValue($user, 'settings', 'email'); $email= \OCP\Config::getUserValue($user, 'settings', 'email');
if($email) { if($email) {
$principals['{http://sabredav.org/ns}email-address'] = $email; $principal['{http://sabredav.org/ns}email-address'] = $email;
} }
return $principal;
} }
return null; return null;