Make fileblacklist configurable

diff --git a/config/config.sample.php b/config/config.sample.php
index 5264e94820058be2e40937b255e23bb47e49f7d6..163beaae2f4295e65e315172507e13244cabfa56 100644 (file)
--- 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 262fde320a1be5301c5bf0f44b478ff4d68ee8df..47c09acf294114eceebc66693986d6d5b2c8ad29 100644 (file)
--- 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'])) {