allow admin to change user accounts more easily

team-olmen · Jul 29, 2017 · b04dadc · b04dadc
1 parent b6a044b
commit b04dadc
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/OlmServer/OlmApi.php b/src/OlmServer/OlmApi.php
@@ -1418,13 +1418,13 @@ public function controllerUsersPatch(\Symfony\Component\HttpFoundation\Request $
 
 		if (!isset($data['check'])) {
 			$this->sendError(self::RESPONSE_PASSWORD_MISSING);
+		} else {
+			if (!$user->isAdmin() && !$this->app['users']->isPasswordValid($data['check'], $user->getPassword())) {
+				$this->sendError(self::RESPONSE_WRONG_PASSWORD);
+			}
+			unset($data['check']);
 		}
 
-		if (!$this->app['users']->isPasswordValid($data['check'], $user->getPassword())) {
-			$this->sendError(self::RESPONSE_WRONG_PASSWORD);
-		}
-		unset($data['check']);
-
 		if (isset($data['password']) && !empty($data['password'])) {
 			$data['password'] = $this->app['users']->encodePassword($data['password'], empty($data['salt']) ? null : $data['salt']);
 		} else {