Work on util: findFiles() and encryptAll(); both close to working

Ecnryption unit tests are failing, recursion in filecache{}

2 files changed, 3 insertions, 73 deletions

diff --git a/apps/files_encryption/templates/settings-personal.php b/apps/files_encryption/templates/settings-personal.php
index 1274bd3bb5c..c8144da5633 100644
--- a/apps/files_encryption/templates/settings-personal.php
+++ b/apps/files_encryption/templates/settings-personal.php
@@ -12,22 +12,11 @@
 			<input 

 			type="radio" 

 			name="encryption_mode" 

-			value="client" 

-			id='client_encryption' 

-			style="width:20px;" 

-			<?php if ($_['encryption_mode'] == 'client') echo "checked='checked'"?>

-			/> 

-			<?php echo $l->t('Client side encryption (most secure but makes it impossible to access your data from the web interface)'); ?>

-			<br />

-			

-			<input 

-			type="radio" 

-			name="encryption_mode" 

 			value="server" 

 			id='server_encryption' 

 			style="width:20px;" <?php if ($_['encryption_mode'] == 'server') echo "checked='checked'"?>

 			/> 

-			<?php echo $l->t('Server side encryption (allows you to access your files from the web interface and the desktop client)'); ?>

+			<?php echo $l->t('Server side encryption (allows you to access your files from the web interface)'); ?>

 			<br />

 			

 			<input 

diff --git a/apps/files_encryption/templates/settings.php b/apps/files_encryption/templates/settings.php
index 544ec793f37..17ac1fd224f 100644
--- a/apps/files_encryption/templates/settings.php
+++ b/apps/files_encryption/templates/settings.php
@@ -1,70 +1,11 @@
 <form id="encryption">
 	<fieldset class="personalblock">
 		
-		<strong>
-			<?php echo $l->t('Choose encryption mode:'); ?>
-		</strong>
-		
-		<p>
-			<i>
-				<?php echo $l->t('Important: Once you selected an encryption mode there is no way to change it back'); ?>
-			</i>
-		</p>
-		
-		<p>
-			<input 
-			type="radio" 
-			name="encryption_mode" 
-			id="client_encryption" 
-			value="client" 
-			style="width:20px;" 
-			<?php if ($_['encryption_mode'] == 'client') echo "checked='checked'"; if ($_['encryption_mode'] != 'none') echo "DISABLED"?> 
-			/> 
-			
-			<?php echo $l->t("Client side encryption (most secure but makes it impossible to access your data from the web interface)"); ?>
-			<br />
-			
-			<input
-			type="radio" 
-			name="encryption_mode" 
-			id="server_encryption" 
-			value="server" 
-			style="width:20px;" 
-			<?php if ($_['encryption_mode'] == 'server') echo "checked='checked'"; if ($_['encryption_mode'] != 'none') echo "DISABLED"?> 
-			/> 
-			
-			<?php echo $l->t('Server side encryption (allows you to access your files from the web interface and the desktop client)'); ?>
-			<br />
-			
-			<input
-			type="radio" 
-			name="encryption_mode" 
-			id="user_encryption" 
-			value="user" 
-			style="width:20px;" 
-			<?php if ($_['encryption_mode'] == 'user') echo "checked='checked'"; if ($_['encryption_mode'] != 'none') echo "DISABLED"?> 
-			/>
-			
-			<?php echo $l->t('User specific (let the user decide)'); ?>
-			<br/>
-			
-			<input
-			type="radio" 
-			name="encryption_mode" 
-			id="none_encryption" 
-			value="none" 
-			style="width:20px;" 
-			<?php if ($_['encryption_mode'] == 'none') echo "checked='checked'"; if ($_['encryption_mode'] != 'none') echo "DISABLED"?>
-			/> 
-			
-			<?php echo $l->t('None (no encryption at all)'); ?>
-			<br/>
-			
-		</p>
 		<p>
 			<strong><?php echo $l->t('Encryption'); ?></strong>
 			
-			<?php echo $l->t("Exclude the following file types from encryption"); ?>
+			<?php echo $l->t("Exclude the following file types from encryption:"); ?>
+			<br />
 			
 			<select 
 			id='encryption_blacklist'