mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix password change when files_encryption app is disabled

This commit is contained in:
Florin Peter 2013-06-03 19:06:20 +02:00
parent dc8bcf0688
commit 563f343291
1 changed files with 29 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
settings/ajax/changepassword.php
View File

@ -7,38 +7,44 @@ 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())) {
$userstatus = 'admin'; $userstatus = 'admin';
} }
if(OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username)) { if (OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username)) {
$userstatus = 'subadmin'; $userstatus = 'subadmin';
} }
if(OC_User::getUser() === $username && OC_User::checkPassword($username, $oldPassword)) { if (OC_User::getUser() === $username && OC_User::checkPassword($username, $oldPassword)) {
$userstatus = 'user'; $userstatus = 'user';
} }
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);
$recoveryAdminEnabled = OC_Appconfig::getValue('files_encryption', 'recoveryAdminEnabled');
$recoveryEnabledForUser = $util->recoveryEnabledForUser();
$util = new \OCA\Encryption\Util(new \OC_FilesystemView('/'), $username); if ($recoveryAdminEnabled && $recoveryEnabledForUser && $recoveryPassword === '') {
$recoveryAdminEnabled = OC_Appconfig::getValue( 'files_encryption', 'recoveryAdminEnabled' ); OC_JSON::error(array('data' => array('message' => 'Please provide a admin recovery password, otherwise all user data will be lost')));
$recoveryEnabledForUser = $util->recoveryEnabledForUser(); } elseif ($recoveryPassword && !$util->checkRecoveryPassword($recoveryPassword)) {
OC_JSON::error(array('data' => array('message' => 'Wrong admin recovery password. Please check the password and try again.')));
if ($recoveryAdminEnabled && $recoveryEnabledForUser && $recoveryPassword == '') { } elseif (!is_null($password) && OC_User::setPassword($username, $password, $recoveryPassword)) {
OC_JSON::error(array("data" => array( "message" => "Please provide a admin recovery password, otherwise all user data will be lost" ))); OC_JSON::success(array('data' => array('username' => $username)));
}elseif ( $recoveryPassword && ! $util->checkRecoveryPassword($recoveryPassword) ) { } else {
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' => 'Unable to change password')));
}elseif(!is_null($password) && OC_User::setPassword( $username, $password, $recoveryPassword )) { }
OC_JSON::success(array("data" => array( "username" => $username ))); } else {
} if (!is_null($password) && OC_User::setPassword($username, $password)) {
else{ OC_JSON::success(array('data' => array('username' => $username)));
OC_JSON::error(array("data" => array( "message" => "Unable to change password" ))); } else {
} OC_JSON::error(array('data' => array('message' => 'Unable to change password')));
}
}