diff options
| author | Björn Schießle <schiessle@owncloud.com> | 2013-02-22 16:08:08 +0100 |
|---|---|---|
| committer | Björn Schießle <schiessle@owncloud.com> | 2013-02-22 16:08:08 +0100 |
| commit | 31c434b79560c3c45e6202cecc635ad6cb887390 (patch) | |
| tree | 8f0b313a5a2bd06017f69636f402ed2f8aa96984 /apps/files_encryption | |
| parent | 40efeb91878e72eb5c2eb1ab50574cda9435e0fa (diff) | |
| download | nextcloud-server-31c434b79560c3c45e6202cecc635ad6cb887390.tar.gz nextcloud-server-31c434b79560c3c45e6202cecc635ad6cb887390.zip | |
the default should be to encrypt all files if the user/admin doesn't specify a blacklist explicitely
Diffstat (limited to 'apps/files_encryption')
| -rw-r--r-- | apps/files_encryption/lib/proxy.php | 2 | ||||
| -rw-r--r-- | apps/files_encryption/settings-personal.php | 2 | ||||
| -rw-r--r-- | apps/files_encryption/settings.php | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php index ebe09dc075a..56c9000bfb0 100644 --- a/apps/files_encryption/lib/proxy.php +++ b/apps/files_encryption/lib/proxy.php @@ -70,7 +70,7 @@ class Proxy extends \OC_FileProxy { if ( is_null(self::$blackList ) ) { - self::$blackList = explode(',', \OCP\Config::getAppValue( 'files_encryption', 'type_blacklist', 'jpg,png,jpeg,avi,mpg,mpeg,mkv,mp3,oga,ogv,ogg' ) ); + self::$blackList = explode(',', \OCP\Config::getAppValue( 'files_encryption', 'type_blacklist', '' ) ); } diff --git a/apps/files_encryption/settings-personal.php b/apps/files_encryption/settings-personal.php index 6fe4ea6d564..94e37ebe96b 100644 --- a/apps/files_encryption/settings-personal.php +++ b/apps/files_encryption/settings-personal.php @@ -8,7 +8,7 @@ $tmpl = new OCP\Template( 'files_encryption', 'settings-personal');
-$blackList = explode( ',', \OCP\Config::getAppValue( 'files_encryption', 'type_blacklist', 'jpg,png,jpeg,avi,mpg,mpeg,mkv,mp3,oga,ogv,ogg' ) );
+$blackList = explode( ',', \OCP\Config::getAppValue( 'files_encryption', 'type_blacklist', '' ) );
$tmpl->assign( 'blacklist', $blackList );
diff --git a/apps/files_encryption/settings.php b/apps/files_encryption/settings.php index d1260f44e9f..85c616bca79 100644 --- a/apps/files_encryption/settings.php +++ b/apps/files_encryption/settings.php @@ -10,7 +10,7 @@ $tmpl = new OCP\Template( 'files_encryption', 'settings' ); -$blackList = explode( ',', \OCP\Config::getAppValue( 'files_encryption', 'type_blacklist', 'jpg,png,jpeg,avi,mpg,mpeg,mkv,mp3,oga,ogv,ogg' ) ); +$blackList = explode( ',', \OCP\Config::getAppValue( 'files_encryption', 'type_blacklist', '' ) ); $tmpl->assign( 'blacklist', $blackList ); $tmpl->assign( 'encryption_mode', \OC_Appconfig::getValue( 'files_encryption', 'mode', 'none' ) ); |