diff options
| author | Björn Schießle <schiessle@owncloud.com> | 2013-06-12 20:53:45 +0200 |
|---|---|---|
| committer | Björn Schießle <schiessle@owncloud.com> | 2013-06-12 20:53:45 +0200 |
| commit | 27fcdb3af5d1b1012695a09e04c0a654a1dde710 (patch) | |
| tree | 6de492454c862852de3f51bd8834e2012139b5ac /apps/files_encryption/hooks | |
| parent | 46e5e9bd73a68f7b50bb79f883a8bc6efacaca97 (diff) | |
| parent | 3584d48d65900b15dc3ef6831926f4a52e508625 (diff) | |
| download | nextcloud-server-27fcdb3af5d1b1012695a09e04c0a654a1dde710.tar.gz nextcloud-server-27fcdb3af5d1b1012695a09e04c0a654a1dde710.zip | |
Merge branch 'master' into files_encryption_upgrade_fix
Conflicts:
apps/files_encryption/tests/crypt.php
Diffstat (limited to 'apps/files_encryption/hooks')
| -rw-r--r-- | apps/files_encryption/hooks/hooks.php | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php index f823999dcb0..94fc19fae2a 100644 --- a/apps/files_encryption/hooks/hooks.php +++ b/apps/files_encryption/hooks/hooks.php @@ -142,6 +142,15 @@ class Hooks { }
/**
+ * @brief If the password can't be changed within ownCloud, than update the key password in advance.
+ */
+ public static function preSetPassphrase($params) {
+ if ( ! \OC_User::canUserChangePassword($params['uid']) ) {
+ self::setPassphrase($params);
+ }
+ }
+
+ /**
* @brief Change a user's encryption passphrase
* @param array $params keys: uid, password
*/
|