diff options
| author | Bjoern Schiessle <schiessle@owncloud.com> | 2015-04-07 18:05:54 +0200 |
|---|---|---|
| committer | Bjoern Schiessle <schiessle@owncloud.com> | 2015-04-16 14:15:04 +0200 |
| commit | e3d77c4b0181e2219f30f720ac7077b334210f5d (patch) | |
| tree | 8d2042de13e0ff8036b92c2040e64c5774e2e6be /settings | |
| parent | 1a894bd0d8ab034f35dbb3b723dd195e7f66aab4 (diff) | |
| download | nextcloud-server-e3d77c4b0181e2219f30f720ac7077b334210f5d.tar.gz nextcloud-server-e3d77c4b0181e2219f30f720ac7077b334210f5d.zip | |
add migration script from old encryption to new one
Diffstat (limited to 'settings')
| -rw-r--r-- | settings/admin.php | 1 | ||||
| -rw-r--r-- | settings/templates/admin.php | 9 |
2 files changed, 7 insertions, 3 deletions
diff --git a/settings/admin.php b/settings/admin.php index 976d0a5c3f1..43b21f40929 100644 --- a/settings/admin.php +++ b/settings/admin.php @@ -82,6 +82,7 @@ $excludedGroupsList = $appConfig->getValue('core', 'shareapi_exclude_groups_list $excludedGroupsList = explode(',', $excludedGroupsList); // FIXME: this should be JSON! $template->assign('shareExcludedGroupsList', implode('|', $excludedGroupsList)); $template->assign('encryptionEnabled', \OC::$server->getEncryptionManager()->isEnabled()); +$template->assign('encryptionReady', \OC::$server->getEncryptionManager()->isReady()); $encryptionModules = \OC::$server->getEncryptionManager()->getEncryptionModules(); try { $defaultEncryptionModule = \OC::$server->getEncryptionManager()->getDefaultEncryptionModule(); diff --git a/settings/templates/admin.php b/settings/templates/admin.php index 4bc497df764..299592bdd82 100644 --- a/settings/templates/admin.php +++ b/settings/templates/admin.php @@ -307,8 +307,11 @@ if ($_['cronErrors']) { <label for="encryptionEnabled"><?php p($l->t('Enable Server-Side-Encryption'));?></label><br/> </p> <div id='selectEncryptionModules' class="<?php if (!$_['encryptionEnabled']) { p('hidden'); }?>"> - <?php if (empty($_['encryptionModules'])): p('No encryption module loaded, please load a encryption module in the app menu'); - else: ?> + <?php if ($_['encryptionReady'] === false) { + p('Seems like you are in transit from the old encryption (ownCloud <= 8.0) to the new one. Please enable the "ownCloud Default Encryption Module" and run \'occ encryption:migrate\''); + } elseif (empty($_['encryptionModules'])) { + p('No encryption module loaded, please load a encryption module in the app menu'); + } else { ?> <h3>Select default encryption module:</h3> <fieldset id='encryptionModules'> <?php foreach ($_['encryptionModules'] as $id => $module): ?> @@ -319,7 +322,7 @@ if ($_['cronErrors']) { <label for="<?php p($id) ?>"><?php p($module['displayName']) ?></label><br /> <?php endforeach;?> </fieldset> - <?php endif; ?> + <?php } ?> </div> </div> |