diff options
author | Lukas Reschke <lukas@owncloud.com> | 2014-11-25 18:12:12 +0300 |
---|---|---|
committer | Lukas Reschke <lukas@owncloud.com> | 2014-11-25 18:26:47 +0300 |
commit | fc116f563fec20447e7300605d940cada975154c (patch) | |
tree | 0118df1fba46e54ecf821f84ba388e26ecae4e37 /settings | |
parent | 553188273c24835b2f8e36e488208f486d674bfc (diff) |
Allow read-only configuration
Workaround required for IIS setups running ownCloud to prevent dataloss.
Long-term solution would be to move some configuration settings to the database
Diffstat (limited to 'settings')
-rw-r--r-- | settings/admin.php | 1 | ||||
-rw-r--r-- | settings/templates/admin.php | 20 |
2 files changed, 18 insertions, 3 deletions
diff --git a/settings/admin.php b/settings/admin.php index a669974891c..50a4ac4f1c8 100644 --- a/settings/admin.php +++ b/settings/admin.php @@ -33,6 +33,7 @@ $template->assign('mail_smtppassword', $config->getSystemValue("mail_smtppasswor $template->assign('entries', $entries); $template->assign('entriesremain', $entriesRemaining); $template->assign('htaccessworking', $htAccessWorking); +$template->assign('readOnlyConfigEnabled', OC_Helper::isReadOnlyConfigEnabled()); $template->assign('isLocaleWorking', OC_Util::isSetLocaleWorking()); $template->assign('isPhpCharSetUtf8', OC_Util::isPhpCharSetUtf8()); $template->assign('isAnnotationsWorking', OC_Util::isAnnotationsWorking()); diff --git a/settings/templates/admin.php b/settings/templates/admin.php index 166e36a3605..d29ea4c7f7f 100644 --- a/settings/templates/admin.php +++ b/settings/templates/admin.php @@ -86,14 +86,28 @@ if (!$_['isConnectedViaHTTPS']) { // is htaccess working ? if (!$_['htaccessworking']) { ?> -<div class="section"> - <h2><?php p($l->t('Security Warning'));?></h2> + <div class="section"> + <h2><?php p($l->t('Security Warning')); ?></h2> <span class="securitywarning"> <?php p($l->t('Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root.')); ?> </span> -</div> + </div> +<?php +} + +// is read only config enabled +if ($_['readOnlyConfigEnabled']) { +?> +<div class="section"> + <h2><?php p($l->t('Read-Only config enabled'));?></h2> + + <span class="securitywarning"> + <?php p($l->t('The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update.')); ?> + </span> + + </div> <?php } // Are doc blocks accessible? |