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

Merge pull request #15978 from owncloud/feature/fix-encryption-tooltips 

[enc2]fixing recovery tooltip
This commit is contained in:
Thomas Müller 2015-05-15 22:39:17 +02:00
parent 2cafbc803a 9727386d8b
commit 257ee205bb
3 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
settings/changepassword/controller.php
View File

@ -113,30 +113,27 @@ class Controller {
$recoveryEnabledForUser = false;
if ($recoveryAdminEnabled) {
$validRecoveryPassword = $keyManager->checkRecoveryPassword($recoveryPassword);
$recoveryEnabledForUser = $recovery->isRecoveryEnabledForUser();
$recoveryEnabledForUser = $recovery->isRecoveryEnabledForUser($username);
}
$l = new \OC_L10n('settings');
if ($recoveryEnabledForUser && $recoveryPassword === '') {
$l = new \OC_L10n('settings');
\OC_JSON::error(array('data' => array(
'message' => $l->t('Please provide an admin recovery password, otherwise all user data will be lost')
)));
} elseif ($recoveryEnabledForUser && ! $validRecoveryPassword) {
$l = new \OC_L10n('settings');
\OC_JSON::error(array('data' => array(
'message' => $l->t('Wrong admin recovery password. Please check the password and try again.')
)));
} else { // now we know that everything is fine regarding the recovery password, let's try to change the password
$result = \OC_User::setPassword($username, $password, $recoveryPassword);
if (!$result && $recoveryEnabledForUser) {
$l = new \OC_L10n('settings');
\OC_JSON::error(array(
"data" => array(
"message" => $l->t("Backend doesn't support password change, but the user's encryption key was successfully updated.")
)
));
} elseif (!$result && !$recoveryEnabledForUser) {
$l = new \OC_L10n('settings');
\OC_JSON::error(array("data" => array( "message" => $l->t("Unable to change password" ) )));
} else {
\OC_JSON::success(array("data" => array( "username" => $username )));
@ -147,7 +144,6 @@ class Controller {
if (!is_null($password) && \OC_User::setPassword($username, $password)) {
\OC_JSON::success(array('data' => array('username' => $username)));
} else {
$l = new \OC_L10n('settings');
\OC_JSON::error(array('data' => array('message' => $l->t('Unable to change password'))));
}
}

6
settings/controller/userscontroller.php
View File

@ -122,10 +122,10 @@ class UsersController extends Controller {
$this->subAdminFactory = $subAdminFactory;
// check for encryption state - TODO see formatUserForIndex
$this->isEncryptionAppEnabled = $appManager->isEnabledForUser('files_encryption');
$this->isEncryptionAppEnabled = $appManager->isEnabledForUser('encryption');
if($this->isEncryptionAppEnabled) {
// putting this directly in empty is possible in PHP 5.5+
$result = $config->getAppValue('files_encryption', 'recoveryAdminEnabled', 0);
$result = $config->getAppValue('encryption', 'recoveryAdminEnabled', 0);
$this->isRestoreEnabled = !empty($result);
}
}
@ -148,7 +148,7 @@ class UsersController extends Controller {
if ($this->isEncryptionAppEnabled) {
if ($this->isRestoreEnabled) {
// check for the users recovery setting
$recoveryMode = $this->config->getUserValue($user->getUID(), 'files_encryption', 'recovery_enabled', '0');
$recoveryMode = $this->config->getUserValue($user->getUID(), 'encryption', 'recoveryEnabled', '0');
// method call inside empty is possible with PHP 5.5+
$recoveryModeEnabled = !empty($recoveryMode);
if ($recoveryModeEnabled) {

18
tests/settings/controller/userscontrollertest.php
View File

@ -1303,14 +1303,14 @@ class UsersControllerTest extends \Test\TestCase {
->expects($this->once())
->method('isEnabledForUser')
->with(
$this->equalTo('files_encryption')
$this->equalTo('encryption')
)
->will($this->returnValue(true));
$this->container['Config']
->expects($this->once())
->method('getAppValue')
->with(
$this->equalTo('files_encryption'),
$this->equalTo('encryption'),
$this->equalTo('recoveryAdminEnabled'),
$this->anything()
)
@ -1321,8 +1321,8 @@ class UsersControllerTest extends \Test\TestCase {
->method('getUserValue')
->with(
$this->anything(),
$this->equalTo('files_encryption'),
$this->equalTo('recovery_enabled'),
$this->equalTo('encryption'),
$this->equalTo('recoveryEnabled'),
$this->anything()
)
->will($this->returnValue('1'));
@ -1339,7 +1339,7 @@ class UsersControllerTest extends \Test\TestCase {
$this->container['OCP\\App\\IAppManager']
->method('isEnabledForUser')
->with(
$this->equalTo('files_encryption')
$this->equalTo('encryption')
)
->will($this->returnValue(true));
@ -1358,14 +1358,14 @@ class UsersControllerTest extends \Test\TestCase {
->expects($this->once())
->method('isEnabledForUser')
->with(
$this->equalTo('files_encryption')
$this->equalTo('encryption')
)
->will($this->returnValue(true));
$this->container['Config']
->expects($this->once())
->method('getAppValue')
->with(
$this->equalTo('files_encryption'),
$this->equalTo('encryption'),
$this->equalTo('recoveryAdminEnabled'),
$this->anything()
)
@ -1376,8 +1376,8 @@ class UsersControllerTest extends \Test\TestCase {
->method('getUserValue')
->with(
$this->anything(),
$this->equalTo('files_encryption'),
$this->equalTo('recovery_enabled'),
$this->equalTo('encryption'),
$this->equalTo('recoveryEnabled'),
$this->anything()
)
->will($this->returnValue('0'));