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

allow multiple values for phone, website, address and email 

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
This commit is contained in:
Björn Schießle 2016-04-25 16:30:06 +02:00 committed by Roeland Jago Douma
parent 445a254c1e
commit 1700e3dccc
No known key found for this signature in database
GPG Key ID: F941078878347C0C
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
settings/Controller/UsersController.php
View File

@ -534,10 +534,10 @@ class UsersController extends Controller {
$data = [
'avatar' => ['scope' => $avatarScope],
'displayName' => ['value' => $displayname, 'scope' => $displaynameScope],
'email' => ['value' => $email, 'scope' => $emailScope],
'website' => ['value' => $website, 'scope' => $websiteScope],
'address' => ['value' => $address, 'scope' => $addressScope],
'phone' => ['value' => $phone, 'scope' => $phoneScope]
'email' => [['value' => $email, 'scope' => $emailScope]],
'website' => [['value' => $website, 'scope' => $websiteScope]],
'address' => [['value' => $address, 'scope' => $addressScope]],
'phone' => [['value' => $phone, 'scope' => $phoneScope]]
];
$this->accountManager->updateUser($userId, $data);

14
settings/personal.php
View File

@ -169,16 +169,16 @@ $tmpl->assign('passwordChangeSupported', OC_User::canUserChangePassword(OC_User:
$tmpl->assign('displayNameChangeSupported', OC_User::canUserChangeDisplayName(OC_User::getUser()));
$tmpl->assign('displayName', OC_User::getDisplayName());
$tmpl->assign('phone', isset($userData['phone']['value']) ? $userData['phone']['value'] : null);
$tmpl->assign('website', isset($userData['website']['value']) ? $userData['website']['value'] : null);
$tmpl->assign('address', isset($userData['address']['value']) ? $userData['address']['value'] : null);
$tmpl->assign('phone', isset($userData['phone'][0]['value']) ? $userData['phone'][0]['value'] : null);
$tmpl->assign('website', isset($userData['website'][0]['value']) ? $userData['website'][0]['value'] : null);
$tmpl->assign('address', isset($userData['address'][0]['value']) ? $userData['address'][0]['value'] : null);
$tmpl->assign('avatarScope', isset($userData['avatar']['scope']) ? $userData['avatar']['scope'] : 'contacts');
$tmpl->assign('displayNameScope', isset($userData['displayName']['scope']) ? $userData['displayName']['scope'] : 'contacts');
$tmpl->assign('phoneScope', isset($userData['phone']['scope']) ? $userData['phone']['scope'] : 'private');
$tmpl->assign('emailScope', isset($userData['email']['scope']) ? $userData['email']['scope'] : 'private');
$tmpl->assign('websiteScope', isset($userData['website']['scope']) ? $userData['website']['scope'] : 'private');
$tmpl->assign('addressScope', isset($userData['address']['scope']) ? $userData['address']['scope'] : 'private');
$tmpl->assign('phoneScope', isset($userData['phone'][0]['scope']) ? $userData['phone'][0]['scope'] : 'private');
$tmpl->assign('emailScope', isset($userData['email'][0]['scope']) ? $userData['email'][0]['scope'] : 'private');
$tmpl->assign('websiteScope', isset($userData['website'][0]['scope']) ? $userData['website'][0]['scope'] : 'private');
$tmpl->assign('addressScope', isset($userData['address'][0]['scope']) ? $userData['address'][0]['scope'] : 'private');
$tmpl->assign('enableAvatars', $config->getSystemValue('enable_avatars', true) === true);
$tmpl->assign('avatarChangeSupported', OC_User::canUserChangeAvatar(OC_User::getUser()));