Merge pull request #9044 from owncloud/add-missing-email-principal

adding missing email address for principal

1 files changed, 12 insertions, 0 deletions

diff --git a/lib/private/connector/sabre/principal.php b/lib/private/connector/sabre/principal.php
index 9bad3b9df16..c674e2aa779 100644
--- a/lib/private/connector/sabre/principal.php
+++ b/lib/private/connector/sabre/principal.php
@@ -26,11 +26,17 @@ class OC_Connector_Sabre_Principal implements \Sabre\DAVACL\PrincipalBackend\Bac
 
 		if ($prefixPath == 'principals') {
 			foreach(OC_User::getUsers() as $user) {
+
 				$user_uri = 'principals/'.$user;
 				$principals[] = array(
 					'uri' => $user_uri,
 					'{DAV:}displayname' => $user,
 				);
+
+				$email= \OCP\Config::getUserValue($user, 'settings', 'email');
+				if($email) {
+					$principals['{http://sabredav.org/ns}email-address'] = $email;
+				}
 			}
 		}
 
@@ -49,10 +55,16 @@ class OC_Connector_Sabre_Principal implements \Sabre\DAVACL\PrincipalBackend\Bac
 		list($prefix, $name) = explode('/', $path);
 
 		if ($prefix == 'principals' && OC_User::userExists($name)) {
+
 			return array(
 				'uri' => 'principals/'.$name,
 				'{DAV:}displayname' => $name,
 			);
+
+			$email= \OCP\Config::getUserValue($user, 'settings', 'email');
+			if($email) {
+				$principals['{http://sabredav.org/ns}email-address'] = $email;
+			}
 		}
 
 		return null;