summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Reschke <lukas@owncloud.com>2014-08-14 00:06:19 +0200
committerThomas Müller <thomas.mueller@tmit.eu>2014-08-19 09:57:03 +0200
commitc33d1cacd48809e62b442febe9743424093e0ae8 (patch)
tree0df85832b1193565d23c829ae66d811c12ba40c5
parentfc462c5edb9c7fcb58be336d18a95b02bea4e273 (diff)
downloadnextcloud-server-c33d1cacd48809e62b442febe9743424093e0ae8.tar.gz
nextcloud-server-c33d1cacd48809e62b442febe9743424093e0ae8.zip
Add a copied_sample_config switch
Hopefully this will stop people from copying the sample config. I'm so annoyed by all those wrong bug reports... Add some explanation about this switch Move check to init
-rwxr-xr-xconfig/config.sample.php4
-rw-r--r--lib/base.php12
2 files changed, 16 insertions, 0 deletions
diff --git a/config/config.sample.php b/config/config.sample.php
index 1cf2c22866a..33e16f4710b 100755
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -172,6 +172,10 @@ $CONFIG = array(
/* File for the owncloud logger to log to, (default is ownloud.log in the data dir) */
"logfile" => "",
+/* This entry is just here to show a warning in case somebody copied the sample configuration. DO NOT ADD THIS SWITCH TO YOUR CONFIGURATION! */
+/* If you, brave person, have read until here be aware that you should not modify *ANY* settings in this file without reading the documentation */
+"copied_sample_config" => true,
+
/* Loglevel to start logging at. 0=DEBUG, 1=INFO, 2=WARN, 3=ERROR (default is WARN) */
"loglevel" => "",
diff --git a/lib/base.php b/lib/base.php
index 99c2764d22c..9dd50d7b4cf 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -574,6 +574,18 @@ class OC {
OC_Util::addScript('backgroundjobs');
}
}
+
+ // Check whether the sample configuration has been copied
+ if(OC_Config::getValue('copied_sample_config', false)) {
+ $l = \OC_L10N::get('lib');
+ header('HTTP/1.1 503 Service Temporarily Unavailable');
+ header('Status: 503 Service Temporarily Unavailable');
+ OC_Template::printErrorPage(
+ $l->t('Sample configuration detected'),
+ $l->t('It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php')
+ );
+ return;
+ }
}
private static function registerLocalAddressBook() {