diff options
Diffstat (limited to 'settings/admin.php')
| -rw-r--r-- | settings/admin.php | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/settings/admin.php b/settings/admin.php index bc9224f3998..f08c3cd53b6 100644 --- a/settings/admin.php +++ b/settings/admin.php @@ -82,19 +82,24 @@ $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()); +$backends = \OC::$server->getUserManager()->getBackends(); +$externalBackends = (count($backends) > 1) ? true : false; +$template->assign('encryptionReady', \OC::$server->getEncryptionManager()->isReady()); +$template->assign('externalBackendsEnabled', $externalBackends); $encryptionModules = \OC::$server->getEncryptionManager()->getEncryptionModules(); + try { $defaultEncryptionModule = \OC::$server->getEncryptionManager()->getDefaultEncryptionModule(); $defaultEncryptionModuleId = $defaultEncryptionModule->getId(); } catch (Exception $e) { - $defaultEncryptionModule = null; + $defaultEncryptionModuleId = null; } $encModulues = array(); foreach ($encryptionModules as $module) { - $encModulues[$module->getId()]['displayName'] = $module->getDisplayName(); - $encModulues[$module->getId()]['default'] = false; - if ($defaultEncryptionModule && $module->getId() === $defaultEncryptionModuleId) { - $encModulues[$module->getId()]['default'] = true; + $encModulues[$module['id']]['displayName'] = $module['displayName']; + $encModulues[$module['id']]['default'] = false; + if ($module['id'] === $defaultEncryptionModuleId) { + $encModulues[$module['id']]['default'] = true; } } $template->assign('encryptionModules', $encModulues); @@ -188,9 +193,9 @@ $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' => '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' => 'mail_general_settings', 'section-name' => $l->t('Email server')]; $formsAndMore[] = ['anchor' => 'log-section', 'section-name' => $l->t('Log')]; $formsAndMore[] = ['anchor' => 'admin-tips', 'section-name' => $l->t('Tips & tricks')]; if ($updaterAppPanel) { |