mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add a config option to enable certificate management

This commit is contained in:
Robin Appelman 2016-01-12 12:58:45 +01:00
parent c15cab7ed6
commit 0d0377ebfb
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
config/config.sample.php
View File

@ -846,6 +846,11 @@ $CONFIG = array(
'config' => '/absolute/location/of/openssl.cnf', 'config' => '/absolute/location/of/openssl.cnf',
), ),
/**
* Allow the configuration of system wide trusted certificates
*/
'enable_certificate_management' => false,
/** /**
* Memory caching backend configuration * Memory caching backend configuration
* *

14
settings/admin.php
View File

@ -158,12 +158,14 @@ $template->assign('OutdatedCacheWarning', $outdatedCaches);
// add hardcoded forms from the template // add hardcoded forms from the template
$forms = OC_App::getForms('admin'); $forms = OC_App::getForms('admin');
$certificatesTemplate = new OC_Template('settings', 'certificates'); if ($config->getSystemValue('enable_certificate_management', false)) {
$certificatesTemplate->assign('type', 'admin'); $certificatesTemplate = new OC_Template('settings', 'certificates');
$certificatesTemplate->assign('uploadRoute', 'settings.Certificate.addSystemRootCertificate'); $certificatesTemplate->assign('type', 'admin');
$certificatesTemplate->assign('certs', $certificateManager->listCertificates()); $certificatesTemplate->assign('uploadRoute', 'settings.Certificate.addSystemRootCertificate');
$certificatesTemplate->assign('urlGenerator', $urlGenerator); $certificatesTemplate->assign('certs', $certificateManager->listCertificates());
$forms[] = $certificatesTemplate->fetchPage(); $certificatesTemplate->assign('urlGenerator', $urlGenerator);
$forms[] = $certificatesTemplate->fetchPage();
}
$formsAndMore = array(); $formsAndMore = array();
if ($request->getServerProtocol() !== 'https' || !OC_Util::isAnnotationsWorking() || if ($request->getServerProtocol() !== 'https' || !OC_Util::isAnnotationsWorking() ||