diff options
| author | Björn Schießle <schiessle@owncloud.com> | 2014-07-29 16:27:24 +0200 |
|---|---|---|
| committer | Björn Schießle <schiessle@owncloud.com> | 2014-07-29 16:27:24 +0200 |
| commit | f7d60f1190e5842892bc0b65bdb8f5f41ba04750 (patch) | |
| tree | 296484a4d4e03df5aa18cbed71721c8c567830e9 /apps/files_encryption | |
| parent | a36c4402f5f531aff8ee952742c1dc2f678d75bc (diff) | |
| parent | de4233bc1c6b5cd2605e87c4478b6540f09c2170 (diff) | |
| download | nextcloud-server-f7d60f1190e5842892bc0b65bdb8f5f41ba04750.tar.gz nextcloud-server-f7d60f1190e5842892bc0b65bdb8f5f41ba04750.zip | |
Merge pull request #9951 from owncloud/enc_inproved_error_messages
show a warning in the personal settings and admin settins if the encyption keys are not initialized
Diffstat (limited to 'apps/files_encryption')
| -rw-r--r-- | apps/files_encryption/settings-admin.php | 3 | ||||
| -rw-r--r-- | apps/files_encryption/templates/settings-admin.php | 4 | ||||
| -rw-r--r-- | apps/files_encryption/templates/settings-personal.php | 9 |
3 files changed, 13 insertions, 3 deletions
diff --git a/apps/files_encryption/settings-admin.php b/apps/files_encryption/settings-admin.php index 88e06613997..496a7cffb50 100644 --- a/apps/files_encryption/settings-admin.php +++ b/apps/files_encryption/settings-admin.php @@ -12,8 +12,11 @@ $tmpl = new OCP\Template('files_encryption', 'settings-admin'); // Check if an adminRecovery account is enabled for recovering files after lost pwd $recoveryAdminEnabled = \OC::$server->getAppConfig()->getValue('files_encryption', 'recoveryAdminEnabled', '0'); +$session = new \OCA\Encryption\Session(new \OC\Files\View('/')); +$initStatus = $session->getInitialized(); $tmpl->assign('recoveryEnabled', $recoveryAdminEnabled); +$tmpl->assign('initStatus', $initStatus); \OCP\Util::addscript('files_encryption', 'settings-admin'); \OCP\Util::addscript('core', 'multiselect'); diff --git a/apps/files_encryption/templates/settings-admin.php b/apps/files_encryption/templates/settings-admin.php index d4e6abf004a..a97261dc1c9 100644 --- a/apps/files_encryption/templates/settings-admin.php +++ b/apps/files_encryption/templates/settings-admin.php @@ -1,6 +1,9 @@ <form id="encryption" class="section"> <h2><?php p($l->t('Encryption')); ?></h2> + <?php if($_["initStatus"] === \OCA\Encryption\Session::NOT_INITIALIZED): ?> + <?php p($l->t("Encryption App is enabled but your keys are not initialized, please log-out and log-in again")); ?> + <?php else: ?> <p> <?php p($l->t("Enable recovery key (allow to recover users files in case of password loss):")); ?> <br/> @@ -57,4 +60,5 @@ </button> <span class="msg"></span> </p> + <?php endif; ?> </form> diff --git a/apps/files_encryption/templates/settings-personal.php b/apps/files_encryption/templates/settings-personal.php index e9988df3275..3d44b9fa9a5 100644 --- a/apps/files_encryption/templates/settings-personal.php +++ b/apps/files_encryption/templates/settings-personal.php @@ -1,7 +1,11 @@ <form id="encryption" class="section">
<h2><?php p( $l->t( 'Encryption' ) ); ?></h2>
- <?php if ( $_["initialized"] === '1' ): ?>
+ <?php if ( $_["initialized"] === \OCA\Encryption\Session::NOT_INITIALIZED ): ?>
+
+ <?php p($l->t("Encryption App is enabled but your keys are not initialized, please log-out and log-in again")); ?>
+
+ <?php elseif ( $_["initialized"] === \OCA\Encryption\Session::INIT_EXECUTED ): ?>
<p>
<a name="changePKPasswd" />
<label for="changePrivateKeyPasswd">
@@ -33,9 +37,8 @@ </button>
<span class="msg"></span>
</p>
- <?php endif; ?>
- <?php if ( $_["recoveryEnabled"] && $_["privateKeySet"] ): ?>
+ <?php elseif ( $_["recoveryEnabled"] && $_["privateKeySet"] && $_["initialized"] === \OCA\Encryption\Session::INIT_SUCCESSFUL ): ?>
<br />
<p>
<label for="userEnableRecovery"><?php p( $l->t( "Enable password recovery:" ) ); ?></label>
|