Added support for user-specified password for adminRecovery account in admin settings page

Made encryptAll() (file migration for unencrypted + legacy encrypted files) run only on first login for each user (status stored in DB)
Made recoveryAdmin user member of 'admin' user group automatically
Set recoveryadmin settings to only display on user settings if enabled by an admin
Updated encryption db xml schema

1 files changed, 20 insertions, 18 deletions

diff --git a/apps/files_encryption/templates/settings-personal.php b/apps/files_encryption/templates/settings-personal.php
index 0cefde36b61..c81f361ced9 100644
--- a/apps/files_encryption/templates/settings-personal.php
+++ b/apps/files_encryption/templates/settings-personal.php
@@ -21,24 +21,26 @@
 		</ul>

 		<?php endif; ?>

 		

-		<p>

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

-			<br />

-			<input 

-			type='radio'

-			name='userEnableRecovery'

-			value='1'

-			<?php echo ( $_["recoveryEnabled"] == 1 ? 'checked="checked"' : '' ); ?> />

-			<?php p($l->t( "Enabled" )); ?>

-			<br />

-			

-			<input 

-			type='radio'

-			name='userEnableRecovery'

-			value='0'

-			<?php echo ( $_["recoveryEnabled"] == 0 ? 'checked="checked"' : '' ); ?> />

-			<?php p($l->t( "Disabled" )); ?>

-		</p>

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

+			<p>

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

+				<br />

+				<input 

+				type='radio'

+				name='userEnableRecovery'

+				value='1'

+				<?php echo ( $_["recoveryEnabledForUser"] == 1 ? 'checked="checked"' : '' ); ?> />

+				<?php p($l->t( "Enabled" )); ?>

+				<br />

+				

+				<input 

+				type='radio'

+				name='userEnableRecovery'

+				value='0'

+				<?php echo ( $_["recoveryEnabledForUser"] == 0 ? 'checked="checked"' : '' ); ?> />

+				<?php p($l->t( "Disabled" )); ?>

+			</p>

+		<?php endif; ?>

 		

 	</fieldset>

 </form>