diff options
| -rw-r--r-- | config/config.sample.php | 5 | ||||
| -rw-r--r-- | settings/admin.php | 14 |
2 files changed, 13 insertions, 6 deletions
diff --git a/config/config.sample.php b/config/config.sample.php index 7ba3977fe3a..8e0d89f93dd 100644 --- a/config/config.sample.php +++ b/config/config.sample.php @@ -847,6 +847,11 @@ $CONFIG = array( ), /** + * Allow the configuration of system wide trusted certificates + */ +'enable_certificate_management' => false, + +/** * Memory caching backend configuration * * Available cache backends: diff --git a/settings/admin.php b/settings/admin.php index 7bd3760b6ce..7416e798a8f 100644 --- a/settings/admin.php +++ b/settings/admin.php @@ -158,12 +158,14 @@ $template->assign('OutdatedCacheWarning', $outdatedCaches); // add hardcoded forms from the template $forms = OC_App::getForms('admin'); -$certificatesTemplate = new OC_Template('settings', 'certificates'); -$certificatesTemplate->assign('type', 'admin'); -$certificatesTemplate->assign('uploadRoute', 'settings.Certificate.addSystemRootCertificate'); -$certificatesTemplate->assign('certs', $certificateManager->listCertificates()); -$certificatesTemplate->assign('urlGenerator', $urlGenerator); -$forms[] = $certificatesTemplate->fetchPage(); +if ($config->getSystemValue('enable_certificate_management', false)) { + $certificatesTemplate = new OC_Template('settings', 'certificates'); + $certificatesTemplate->assign('type', 'admin'); + $certificatesTemplate->assign('uploadRoute', 'settings.Certificate.addSystemRootCertificate'); + $certificatesTemplate->assign('certs', $certificateManager->listCertificates()); + $certificatesTemplate->assign('urlGenerator', $urlGenerator); + $forms[] = $certificatesTemplate->fetchPage(); +} $formsAndMore = array(); if ($request->getServerProtocol() !== 'https' || !OC_Util::isAnnotationsWorking() || |