fix password change when files_encryption app is disabled
This commit is contained in:
parent
dc8bcf0688
commit
563f343291
|
@ -7,10 +7,10 @@ OC_JSON::checkLoggedIn();
|
||||||
// Manually load apps to ensure hooks work correctly (workaround for issue 1503)
|
// Manually load apps to ensure hooks work correctly (workaround for issue 1503)
|
||||||
OC_APP::loadApps();
|
OC_APP::loadApps();
|
||||||
|
|
||||||
$username = isset($_POST["username"]) ? $_POST["username"] : OC_User::getUser();
|
$username = isset($_POST['username']) ? $_POST['username'] : OC_User::getUser();
|
||||||
$password = isset($_POST["password"]) ? $_POST["password"] : null;
|
$password = isset($_POST['password']) ? $_POST['password'] : null;
|
||||||
$oldPassword=isset($_POST["oldpassword"])?$_POST["oldpassword"]:'';
|
$oldPassword = isset($_POST['oldpassword']) ? $_POST['oldpassword'] : '';
|
||||||
$recoveryPassword=isset($_POST["recoveryPassword"])?$_POST["recoveryPassword"]:null;
|
$recoveryPassword = isset($_POST['recoveryPassword']) ? $_POST['recoveryPassword'] : null;
|
||||||
|
|
||||||
$userstatus = null;
|
$userstatus = null;
|
||||||
if (OC_User::isAdminUser(OC_User::getUser())) {
|
if (OC_User::isAdminUser(OC_User::getUser())) {
|
||||||
|
@ -24,21 +24,27 @@ if(OC_User::getUser() === $username && OC_User::checkPassword($username, $oldPas
|
||||||
}
|
}
|
||||||
|
|
||||||
if (is_null($userstatus)) {
|
if (is_null($userstatus)) {
|
||||||
OC_JSON::error( array( "data" => array( "message" => "Authentication error" )));
|
OC_JSON::error(array('data' => array('message' => 'Authentication error')));
|
||||||
exit();
|
exit();
|
||||||
}
|
}
|
||||||
|
if (\OCP\App::isEnabled('files_encryption')) {
|
||||||
$util = new \OCA\Encryption\Util(new \OC_FilesystemView('/'), $username);
|
$util = new \OCA\Encryption\Util(new \OC_FilesystemView('/'), $username);
|
||||||
$recoveryAdminEnabled = OC_Appconfig::getValue('files_encryption', 'recoveryAdminEnabled');
|
$recoveryAdminEnabled = OC_Appconfig::getValue('files_encryption', 'recoveryAdminEnabled');
|
||||||
$recoveryEnabledForUser = $util->recoveryEnabledForUser();
|
$recoveryEnabledForUser = $util->recoveryEnabledForUser();
|
||||||
|
|
||||||
if ($recoveryAdminEnabled && $recoveryEnabledForUser && $recoveryPassword == '') {
|
if ($recoveryAdminEnabled && $recoveryEnabledForUser && $recoveryPassword === '') {
|
||||||
OC_JSON::error(array("data" => array( "message" => "Please provide a admin recovery password, otherwise all user data will be lost" )));
|
OC_JSON::error(array('data' => array('message' => 'Please provide a admin recovery password, otherwise all user data will be lost')));
|
||||||
} elseif ($recoveryPassword && !$util->checkRecoveryPassword($recoveryPassword)) {
|
} elseif ($recoveryPassword && !$util->checkRecoveryPassword($recoveryPassword)) {
|
||||||
OC_JSON::error(array("data" => array( "message" => "Wrong admin recovery password. Please check the password and try again." )));
|
OC_JSON::error(array('data' => array('message' => 'Wrong admin recovery password. Please check the password and try again.')));
|
||||||
} elseif (!is_null($password) && OC_User::setPassword($username, $password, $recoveryPassword)) {
|
} elseif (!is_null($password) && OC_User::setPassword($username, $password, $recoveryPassword)) {
|
||||||
OC_JSON::success(array("data" => array( "username" => $username )));
|
OC_JSON::success(array('data' => array('username' => $username)));
|
||||||
|
} else {
|
||||||
|
OC_JSON::error(array('data' => array('message' => 'Unable to change password')));
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if (!is_null($password) && OC_User::setPassword($username, $password)) {
|
||||||
|
OC_JSON::success(array('data' => array('username' => $username)));
|
||||||
|
} else {
|
||||||
|
OC_JSON::error(array('data' => array('message' => 'Unable to change password')));
|
||||||
}
|
}
|
||||||
else{
|
|
||||||
OC_JSON::error(array("data" => array( "message" => "Unable to change password" )));
|
|
||||||
}
|
}
|
Loading…
Reference in New Issue