Fixed recoveryadmin settings in user and admin settings pages (js, templates, ajax)

Renamed recovery methods in Util{} for clarity
Added note about bug causing slow page load and redundant keypair generation
recoveryAdmin functionality not yet complete

1 files changed, 20 insertions, 0 deletions

diff --git a/apps/files_encryption/settings-personal.php b/apps/files_encryption/settings-personal.php
index c001bb0d725..f7ebc425120 100644
--- a/apps/files_encryption/settings-personal.php
+++ b/apps/files_encryption/settings-personal.php
@@ -10,6 +10,26 @@ $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 );

+

+$recoveryEnabledForUser = $util->recoveryEnabledForUser();

+

+\OCP\Util::addscript( 'files_encryption', 'settings-personal' );

+

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

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

 

 return $tmpl->fetchPage();