aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Reschke <lukas@statuscode.ch>2013-02-03 23:03:06 +0100
committerLukas Reschke <lukas@statuscode.ch>2013-02-03 23:03:06 +0100
commit3def7f81873fef84b781174ad12f7e264b4caae5 (patch)
tree5dd3e3eb0a46cb4f47a15a8b52a0e2d5512f55b2
parentb8e6b8692b0c306de6ebfe0a82bfe7bab304cd0a (diff)
downloadnextcloud-server-3def7f81873fef84b781174ad12f7e264b4caae5.tar.gz
nextcloud-server-3def7f81873fef84b781174ad12f7e264b4caae5.zip
Make fileblacklist configurable
-rw-r--r--config/config.sample.php3
-rw-r--r--lib/files/filesystem.php2
2 files changed, 4 insertions, 1 deletions
diff --git a/config/config.sample.php b/config/config.sample.php
index 5264e948200..163beaae2f4 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -32,6 +32,9 @@ $CONFIG = array(
/* Force use of HTTPS connection (true = use HTTPS) */
"forcessl" => false,
+/* Blacklist a specific file and disallow the upload of files with this name - WARNING: USE THIS ONLY IF YOU KNOW WHAT YOU ARE DOING. */
+"blacklisted_files" => array('.htaccess'),
+
/* The automatic hostname detection of ownCloud can fail in certain reverse proxy situations. This option allows to manually override the automatic detection. You can also add a port. For example "www.example.com:88" */
"overwritehost" => "",
diff --git a/lib/files/filesystem.php b/lib/files/filesystem.php
index 262fde320a1..47c09acf294 100644
--- a/lib/files/filesystem.php
+++ b/lib/files/filesystem.php
@@ -374,7 +374,7 @@ class Filesystem {
* @param array $data from hook
*/
static public function isBlacklisted($data) {
- $blacklist = array('.htaccess');
+ $blacklist = \OC_Config::getValue('blacklisted_files', array('.htaccess'));
if (isset($data['path'])) {
$path = $data['path'];
} else if (isset($data['newpath'])) {