Verify passwords for admins

settings/ajax/changepassword.php

@@ -6,7 +6,6 @@ require_once '../../lib/base.php';
 // Check if we are a user
 OCP\JSON::callCheck();
 OC_JSON::checkLoggedIn();
-OC_JSON::verifyUser();
 
 $username = isset($_POST["username"]) ? $_POST["username"] : OC_User::getUser();
 $password = $_POST["password"];
@@ -19,8 +18,13 @@ if(OC_Group::inGroup(OC_User::getUser(), 'admin')) {
 if(OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username)) {
 	$userstatus = 'subadmin';
 }
-if(OC_User::getUser() == $username && OC_User::checkPassword($username, $oldPassword)) {
-	$userstatus = 'user';
+if(OC_User::getUser() === $username) {
+	if (OC_User::checkPassword($username, $oldPassword))
+	{
+		$userstatus = 'user';
+	} else {
+		$userstatus = null;
+	}
 }
 
 if(is_null($userstatus)) {
@@ -28,6 +32,10 @@ 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 )));