diff options
Diffstat (limited to 'settings/ajax')
| -rw-r--r-- | settings/ajax/changedisplayname.php | 66 | ||||
| -rw-r--r-- | settings/ajax/setquota.php | 4 | ||||
| -rw-r--r-- | settings/ajax/togglegroups.php | 4 | ||||
| -rw-r--r-- | settings/ajax/userlist.php | 6 |
4 files changed, 43 insertions, 37 deletions
diff --git a/settings/ajax/changedisplayname.php b/settings/ajax/changedisplayname.php index 69462330765..dff4d733cd2 100644 --- a/settings/ajax/changedisplayname.php +++ b/settings/ajax/changedisplayname.php @@ -1,33 +1,33 @@ -<?php
-// Check if we are a user
-
-OCP\JSON::callCheck();
-OC_JSON::checkLoggedIn();
-
-$username = isset($_POST["username"]) ? $_POST["username"] : OC_User::getUser();
-$displayName = $_POST["displayName"];
-
-$userstatus = null;
-if(OC_User::isAdminUser(OC_User::getUser())) {
- $userstatus = 'admin';
-}
-if(OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username)) {
- $userstatus = 'subadmin';
-}
-
-if ($username == OC_User::getUser() && OC_User::canUserChangeDisplayName($username)) {
- $userstatus = 'changeOwnDisplayName';
-}
-
-if(is_null($userstatus)) {
- OC_JSON::error( array( "data" => array( "message" => $l->t("Authentication error") )));
- exit();
-}
-
-// Return Success story
-if( OC_User::setDisplayName( $username, $displayName )) {
- OC_JSON::success(array("data" => array( "username" => $username, 'displayName' => $displayName )));
-}
-else{
- OC_JSON::error(array("data" => array( "message" => $l->t("Unable to change display name"), displayName => OC_User::getDisplayName($username) )));
-}
\ No newline at end of file +<?php +// Check if we are a user + +OCP\JSON::callCheck(); +OC_JSON::checkLoggedIn(); + +$username = isset($_POST["username"]) ? $_POST["username"] : OC_User::getUser(); +$displayName = $_POST["displayName"]; + +$userstatus = null; +if(OC_User::isAdminUser(OC_User::getUser())) { + $userstatus = 'admin'; +} +if(OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username)) { + $userstatus = 'subadmin'; +} + +if ($username == OC_User::getUser() && OC_User::canUserChangeDisplayName($username)) { + $userstatus = 'changeOwnDisplayName'; +} + +if(is_null($userstatus)) { + OC_JSON::error( array( "data" => array( "message" => $l->t("Authentication error") ))); + exit(); +} + +// Return Success story +if( OC_User::setDisplayName( $username, $displayName )) { + OC_JSON::success(array("data" => array( "username" => $username, 'displayName' => $displayName ))); +} +else{ + OC_JSON::error(array("data" => array( "message" => $l->t("Unable to change display name"), 'displayName' => OC_User::getDisplayName($username) ))); +} diff --git a/settings/ajax/setquota.php b/settings/ajax/setquota.php index 356466c0c00..cd8dc0e2796 100644 --- a/settings/ajax/setquota.php +++ b/settings/ajax/setquota.php @@ -10,7 +10,9 @@ OCP\JSON::callCheck(); $username = isset($_POST["username"])?$_POST["username"]:''; -if(($username == '' && !OC_User::isAdminUser(OC_User::getUser()))|| (!OC_User::isAdminUser(OC_User::getUser()) && !OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username))) { +if(($username == '' && !OC_User::isAdminUser(OC_User::getUser())) + || (!OC_User::isAdminUser(OC_User::getUser()) + && !OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username))) { $l = OC_L10N::get('core'); OC_JSON::error(array( 'data' => array( 'message' => $l->t('Authentication error') ))); exit(); diff --git a/settings/ajax/togglegroups.php b/settings/ajax/togglegroups.php index 9bba9c5269d..f6fd9aba6d9 100644 --- a/settings/ajax/togglegroups.php +++ b/settings/ajax/togglegroups.php @@ -13,7 +13,9 @@ if($username == OC_User::getUser() && $group == "admin" && OC_User::isAdminUser exit(); } -if(!OC_User::isAdminUser(OC_User::getUser()) && (!OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username) || !OC_SubAdmin::isGroupAccessible(OC_User::getUser(), $group))) { +if(!OC_User::isAdminUser(OC_User::getUser()) + && (!OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username) + || !OC_SubAdmin::isGroupAccessible(OC_User::getUser(), $group))) { $l = OC_L10N::get('core'); OC_JSON::error(array( 'data' => array( 'message' => $l->t('Authentication error') ))); exit(); diff --git a/settings/ajax/userlist.php b/settings/ajax/userlist.php index 9bbff80ea0c..5282f4a7143 100644 --- a/settings/ajax/userlist.php +++ b/settings/ajax/userlist.php @@ -29,10 +29,11 @@ if (isset($_GET['offset'])) { } $users = array(); if (OC_User::isAdminUser(OC_User::getUser())) { - $batch = OC_User::getUsers('', 10, $offset); - foreach ($batch as $user) { + $batch = OC_User::getDisplayNames('', 10, $offset); + foreach ($batch as $user => $displayname) { $users[] = array( 'name' => $user, + 'displayname' => $displayname, 'groups' => join(', ', OC_Group::getUserGroups($user)), 'subadmin' => join(', ', OC_SubAdmin::getSubAdminsGroups($user)), 'quota' => OC_Preferences::getValue($user, 'files', 'quota', 'default')); @@ -43,6 +44,7 @@ if (OC_User::isAdminUser(OC_User::getUser())) { foreach ($batch as $user) { $users[] = array( 'name' => $user, + 'displayname' => OC_User::determineDisplayName($user), 'groups' => join(', ', OC_Group::getUserGroups($user)), 'quota' => OC_Preferences::getValue($user, 'files', 'quota', 'default')); } |