summaryrefslogtreecommitdiffstats
path: root/settings
diff options
context:
space:
mode:
authorLukas Reschke <lukas@owncloud.com>2014-11-25 16:12:12 +0100
committerLukas Reschke <lukas@owncloud.com>2014-12-01 17:26:21 +0100
commitf5d95139579fc1865f1f18e13aab24998d2e7d9d (patch)
tree3beeafb38d258fb605c5d070e77b739da36d16b9 /settings
parent3917383ceff739763b8bb48544b858bd18633732 (diff)
downloadnextcloud-server-f5d95139579fc1865f1f18e13aab24998d2e7d9d.tar.gz
nextcloud-server-f5d95139579fc1865f1f18e13aab24998d2e7d9d.zip
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 Conflicts: lib/base.php settings/admin.php
Diffstat (limited to 'settings')
-rw-r--r--settings/admin.php2
-rw-r--r--settings/templates/admin.php20
2 files changed, 19 insertions, 3 deletions
diff --git a/settings/admin.php b/settings/admin.php
index 9b1a822bbdc..31ead44134c 100644
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -42,6 +42,7 @@ $tmpl->assign('mail_smtppassword', OC_Config::getValue( "mail_smtppassword", ''
$tmpl->assign('entries', $entries);
$tmpl->assign('entriesremain', $entriesremain);
$tmpl->assign('htaccessworking', $htaccessworking);
+$tmpl->assign('readOnlyConfigEnabled', OC_Helper::isReadOnlyConfigEnabled());
$tmpl->assign('isLocaleWorking', OC_Util::isSetLocaleWorking());
$tmpl->assign('isAnnotationsWorking', OC_Util::isAnnotationsWorking());
$tmpl->assign('has_fileinfo', OC_Util::fileInfoLoaded());
@@ -56,6 +57,7 @@ $tmpl->assign('shareEnforceExpireDate', OC_Appconfig::getValue('core', 'shareapi
$excludeGroups = OC_Appconfig::getValue('core', 'shareapi_exclude_groups', 'no') === 'yes' ? true : false;
$tmpl->assign('shareExcludeGroups', $excludeGroups);
$excludedGroupsList = OC_Appconfig::getValue('core', 'shareapi_exclude_groups_list', '');
+
$excludedGroupsList = explode(',', $excludedGroupsList); // FIXME: this should be JSON!
$tmpl->assign('shareExcludedGroupsList', implode('|', $excludedGroupsList));
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 90426efa833..20b710744f3 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -62,14 +62,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
}