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

2 files changed, 1 insertions, 34 deletions

diff --git a/apps/files_encryption/settings-personal.php b/apps/files_encryption/settings-personal.php
index 90edc0eae24..ada8ffbc318 100644
--- a/apps/files_encryption/settings-personal.php
+++ b/apps/files_encryption/settings-personal.php
@@ -11,19 +11,6 @@
  

 $tmpl = new OCP\Template( 'files_encryption', 'settings-personal');

 

-$blackList = explode( ',', \OCP\Config::getAppValue( 'files_encryption', 'type_blacklist', '' ) );

-

-// Add human readable message in case nothing is blacklisted

-if ( 

-	1 == count( $blackList )

-	&& $blackList[0] == ''

-) {

-	

-	// FIXME: Make this string translatable

-	$blackList[0] = "(None - all filetypes will be encrypted)";

-

-}

-

 $user = \OCP\USER::getUser();

 $view = new \OC_FilesystemView( '/' );

 $util = new \OCA\Encryption\Util( $view, $user );

@@ -36,7 +23,6 @@ $recoveryEnabledForUser = $util->recoveryEnabledForUser();
 

 $tmpl->assign( 'recoveryEnabled', $recoveryAdminEnabled );

 $tmpl->assign( 'recoveryEnabledForUser', $recoveryEnabledForUser );

-$tmpl->assign( 'blacklist', $blackList );

 

 return $tmpl->fetchPage();

 

diff --git a/apps/files_encryption/templates/settings-personal.php b/apps/files_encryption/templates/settings-personal.php
index 33989416d33..14e8ce960a2 100644
--- 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' ) ); ?>

 		</legend>

 		

-		<p>

-<!-- 			<?php p( $l->t( 'File encryption is enabled.' ) ); ?> -->

-		</p>

-		<?php if ( ! empty( $_["blacklist"] ) ): ?>

-		<p>

-			<strong>File types</strong>

-			<br />

-			<?php p( $l->t( 'The following file types will not be encrypted:' ) ); ?>

-		</p>

-		

-		<ul>

-			<?php foreach( $_["blacklist"] as $type ): ?>

-			<li>

-				<?php p($type); ?>

-			</li>

-			<?php endforeach; ?>

-		</ul>

-		<?php endif; ?>

-		<br />

 		<?php if ( $_["recoveryEnabled"] ): ?>

 			<p>

-				<label for="userEnableRecovery"><?php p( $l->t( "Enable password recovery by sharing all files with administrator:" ) ); ?></label>

+				<label for="userEnableRecovery"><?php p( $l->t( "Enable password recovery by sharing all files with your administrator:" ) ); ?></label>

 				<br />

 				<em><?php p( $l->t( "Enabling this option will allow you to reobtain access to your encrypted files if your password is lost" ) ); ?></em>

 				<br />