settings clean-up; There is no blacklist in the new encryption app

diff --git a/apps/files_encryption/settings-personal.php b/apps/files_encryption/settings-personal.php
index 90edc0eae2442def5966f19609845612b274d8e7..ada8ffbc318bdd1a03bc2be6c9f517137823ee7e 100644 (file)
--- a/apps/files_encryption/settings-personal.php
+++ b/apps/files_encryption/settings-personal.php
@@ -11,19 +11,6 @@
  \r
 $tmpl = new OCP\Template( 'files_encryption', 'settings-personal');\r
 \r
-$blackList = explode( ',', \OCP\Config::getAppValue( 'files_encryption', 'type_blacklist', '' ) );\r
-\r
-// Add human readable message in case nothing is blacklisted\r
-if ( \r
-       1 == count( $blackList )\r
-       && $blackList[0] == ''\r
-) {\r
-       \r
-       // FIXME: Make this string translatable\r
-       $blackList[0] = "(None - all filetypes will be encrypted)";\r
-\r
-}\r
-\r
 $user = \OCP\USER::getUser();\r
 $view = new \OC_FilesystemView( '/' );\r
 $util = new \OCA\Encryption\Util( $view, $user );\r
@@ -36,7 +23,6 @@ $recoveryEnabledForUser = $util->recoveryEnabledForUser();
 \r
 $tmpl->assign( 'recoveryEnabled', $recoveryAdminEnabled );\r
 $tmpl->assign( 'recoveryEnabledForUser', $recoveryEnabledForUser );\r
-$tmpl->assign( 'blacklist', $blackList );\r
 \r
 return $tmpl->fetchPage();\r
 \r

diff --git a/apps/files_encryption/templates/settings-personal.php b/apps/files_encryption/templates/settings-personal.php
index 33989416d33de4f4666ad69da9e8636f72ff49d2..14e8ce960a210c055f95ec69be9694913ccda912 100644 (file)
--- a/apps/files_encryption/templates/settings-personal.php
+++ b/apps/files_encryption/templates/settings-personal.php
@@ -4,28 +4,9 @@
                        <?php p( $l->t( 'Encryption' ) ); ?>\r
                </legend>\r
                \r
-               <p>\r
-<!--                   <?php p( $l->t( 'File encryption is enabled.' ) ); ?> -->\r
-               </p>\r
-               <?php if ( ! empty( $_["blacklist"] ) ): ?>\r
-               <p>\r
-                       <strong>File types</strong>\r
-                       <br />\r
-                       <?php p( $l->t( 'The following file types will not be encrypted:' ) ); ?>\r
-               </p>\r
-               \r
-               <ul>\r
-                       <?php foreach( $_["blacklist"] as $type ): ?>\r
-                       <li>\r
-                               <?php p($type); ?>\r
-                       </li>\r
-                       <?php endforeach; ?>\r
-               </ul>\r
-               <?php endif; ?>\r
-               <br />\r
                <?php if ( $_["recoveryEnabled"] ): ?>\r
                        <p>\r
-                               <label for="userEnableRecovery"><?php p( $l->t( "Enable password recovery by sharing all files with administrator:" ) ); ?></label>\r
+                               <label for="userEnableRecovery"><?php p( $l->t( "Enable password recovery by sharing all files with your administrator:" ) ); ?></label>\r
                                <br />\r
                                <em><?php p( $l->t( "Enabling this option will allow you to reobtain access to your encrypted files if your password is lost" ) ); ?></em>\r
                                <br />\r