summaryrefslogtreecommitdiffstats
path: root/settings/ajax/changepassword.php
diff options
context:
space:
mode:
authorMichael Gapczynski <mtgap@owncloud.com>2013-01-18 23:31:06 -0500
committerMichael Gapczynski <mtgap@owncloud.com>2013-01-18 23:31:06 -0500
commit9e28f924c23294a531e4fd15932abd0416d3eb84 (patch)
tree760c113cce3958558cbd8c343d6064163835f4ac /settings/ajax/changepassword.php
parentda34e58589152f0c696f4eb802f8a4e3b900de0d (diff)
parenta17ca3a69aae0dde9aaf24f23aeffdd8658829f0 (diff)
downloadnextcloud-server-9e28f924c23294a531e4fd15932abd0416d3eb84.tar.gz
nextcloud-server-9e28f924c23294a531e4fd15932abd0416d3eb84.zip
Merge branch 'master' into move-datadirectory-checks
Diffstat (limited to 'settings/ajax/changepassword.php')
-rw-r--r--settings/ajax/changepassword.php6
1 files changed, 1 insertions, 5 deletions
diff --git a/settings/ajax/changepassword.php b/settings/ajax/changepassword.php
index b2db2611518..8d45e62e4d8 100644
--- a/settings/ajax/changepassword.php
+++ b/settings/ajax/changepassword.php
@@ -9,7 +9,7 @@ $password = $_POST["password"];
$oldPassword=isset($_POST["oldpassword"])?$_POST["oldpassword"]:'';
$userstatus = null;
-if(OC_Group::inGroup(OC_User::getUser(), 'admin')) {
+if(OC_User::isAdminUser(OC_User::getUser())) {
$userstatus = 'admin';
}
if(OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username)) {
@@ -30,10 +30,6 @@ if(is_null($userstatus)) {
exit();
}
-if($userstatus === 'admin' || $userstatus === 'subadmin') {
- OC_JSON::verifyUser();
-}
-
// Return Success story
if( OC_User::setPassword( $username, $password )) {
OC_JSON::success(array("data" => array( "username" => $username )));