From: Robin Appelman Date: Wed, 22 Feb 2012 21:20:46 +0000 (+0100) Subject: make encryption filetype blacklist configurable X-Git-Tag: v4.0.0beta~440^2~56 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=814bc2fd2bef739938716ae840a4db0de502422a;p=nextcloud-server.git make encryption filetype blacklist configurable --- diff --git a/apps/files_encryption/appinfo/app.php b/apps/files_encryption/appinfo/app.php index 23f3955aa40..68c445d5d77 100644 --- a/apps/files_encryption/appinfo/app.php +++ b/apps/files_encryption/appinfo/app.php @@ -15,3 +15,5 @@ if(!isset($_SESSION['enckey']) and OC_User::isLoggedIn()){//force the user to re header("Location: ".OC::$WEBROOT.'/'); exit(); } + +OC_App::registerAdmin('files_encryption', 'settings'); diff --git a/apps/files_encryption/js/settings.js b/apps/files_encryption/js/settings.js new file mode 100644 index 00000000000..adbf0c87245 --- /dev/null +++ b/apps/files_encryption/js/settings.js @@ -0,0 +1,19 @@ +/** + * Copyright (c) 2011, Robin Appelman + * This file is licensed under the Affero General Public License version 3 or later. + * See the COPYING-README file. + */ + + +$(document).ready(function(){ + $('#encryption_blacklist').multiSelect({ + oncheck:blackListChange, + onuncheck:blackListChange, + createText:'...', + }); + + function blackListChange(){ + var blackList=$('#encryption_blacklist').val().join(','); + OC.AppConfig.setValue('files_encryption','type_blacklist',blackList); + } +}) \ No newline at end of file diff --git a/apps/files_encryption/settings.php b/apps/files_encryption/settings.php new file mode 100644 index 00000000000..396ad1ba78d --- /dev/null +++ b/apps/files_encryption/settings.php @@ -0,0 +1,16 @@ + + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +$tmpl = new OC_Template( 'files_encryption', 'settings'); +$blackList=explode(',',OC_Appconfig::getValue('files_encryption','type_blacklist','jpg,png,jpeg,avi,mpg,mpeg,mkv,mp3,oga,ogv,ogg')); +$tmpl->assign('blacklist',$blackList); + +OC_Util::addScript('files_encryption','settings'); +OC_Util::addScript('core','multiselect'); + +return $tmpl->fetchPage(); diff --git a/apps/files_encryption/templates/settings.php b/apps/files_encryption/templates/settings.php new file mode 100644 index 00000000000..724a03836a8 --- /dev/null +++ b/apps/files_encryption/templates/settings.php @@ -0,0 +1,11 @@ +
+
+ t('Encryption'); ?> + t("Exclude the following file types from encryption"); ?> + +
+