diff options
author | Morris Jobke <hey@morrisjobke.de> | 2015-05-07 10:44:03 +0200 |
---|---|---|
committer | Morris Jobke <hey@morrisjobke.de> | 2015-05-07 10:44:03 +0200 |
commit | 12b24ee567349faa7991b0a86d45e42b67daf43e (patch) | |
tree | b74b084c76d0aa86e431349f2d0d987e9da2f990 /settings | |
parent | 3dee907b70e649f954db4c9585f302c3fb2c13d9 (diff) | |
parent | eadc2c330c36362cb192d7a352d31b5515aa26d5 (diff) | |
download | nextcloud-server-12b24ee567349faa7991b0a86d45e42b67daf43e.tar.gz nextcloud-server-12b24ee567349faa7991b0a86d45e42b67daf43e.zip |
Merge pull request #16034 from owncloud/issue-15987-encryption-module-admin-page
Display the module settings in the list of the encryption modules
Diffstat (limited to 'settings')
-rw-r--r-- | settings/admin.php | 10 | ||||
-rw-r--r-- | settings/templates/admin.php | 2 |
2 files changed, 10 insertions, 2 deletions
diff --git a/settings/admin.php b/settings/admin.php index e8d9c6530db..5720bd9f99c 100644 --- a/settings/admin.php +++ b/settings/admin.php @@ -141,9 +141,10 @@ if ($request->getServerProtocol() !== 'https' || !OC_Util::isAnnotationsWorking $formsAndMore[] = array('anchor' => 'security-warning', 'section-name' => $l->t('Security & setup warnings')); } $formsAndMore[] = array('anchor' => 'shareAPI', 'section-name' => $l->t('Sharing')); +$formsAndMore[] = ['anchor' => 'encryptionAPI', 'section-name' => $l->t('Server-side encryption')]; // Prioritize fileSharingSettings and files_external and move updater to the version -$fileSharingSettings = $filesExternal = $updaterAppPanel = ''; +$fileSharingSettings = $filesExternal = $updaterAppPanel = $ocDefaultEncryptionModulePanel = ''; foreach ($forms as $index => $form) { if (strpos($form, 'id="fileSharingSettings"')) { $fileSharingSettings = $form; @@ -160,6 +161,11 @@ foreach ($forms as $index => $form) { unset($forms[$index]); continue; } + if (strpos($form, 'id="ocDefaultEncryptionModule"')) { + $ocDefaultEncryptionModulePanel = $form; + unset($forms[$index]); + continue; + } } if ($filesExternal) { $formsAndMore[] = array('anchor' => 'files_external', 'section-name' => $l->t('External Storage')); @@ -168,6 +174,7 @@ if ($filesExternal) { $template->assign('fileSharingSettings', $fileSharingSettings); $template->assign('filesExternal', $filesExternal); $template->assign('updaterAppPanel', $updaterAppPanel); +$template->assign('ocDefaultEncryptionModulePanel', $ocDefaultEncryptionModulePanel); $formsMap = array_map(function ($form) { if (preg_match('%(<h2[^>]*>.*?</h2>)%i', $form, $regs)) { @@ -190,7 +197,6 @@ $formsMap = array_map(function ($form) { $formsAndMore = array_merge($formsAndMore, $formsMap); // add bottom hardcoded forms from the template -$formsAndMore[] = ['anchor' => 'encryptionAPI', 'section-name' => $l->t('Server-side encryption')]; $formsAndMore[] = ['anchor' => 'backgroundjobs', 'section-name' => $l->t('Cron')]; $formsAndMore[] = ['anchor' => 'mail_general_settings', 'section-name' => $l->t('Email server')]; $formsAndMore[] = ['anchor' => 'log-section', 'section-name' => $l->t('Log')]; diff --git a/settings/templates/admin.php b/settings/templates/admin.php index f5a3a40662a..1fc8c9faf7e 100644 --- a/settings/templates/admin.php +++ b/settings/templates/admin.php @@ -351,6 +351,8 @@ if ($_['cronErrors']) { <label for="<?php p($id) ?>"><?php p($module['displayName']) ?></label> <br/> + + <?php if ($id === 'OC_DEFAULT_MODULE') print_unescaped($_['ocDefaultEncryptionModulePanel']); ?> <?php endforeach; ?> </fieldset> <?php } ?> |