reformat code

remotes/origin/stable6
Florin Peter 12 years ago
parent 838fd1a20a
commit d59ae569ba
  1. 12
      apps/files_encryption/settings-admin.php
  2. 18
      apps/files_encryption/settings-personal.php

@ -8,16 +8,16 @@
\OC_Util::checkAdminUser(); \OC_Util::checkAdminUser();
$tmpl = new OCP\Template( 'files_encryption', 'settings-admin' ); $tmpl = new OCP\Template('files_encryption', 'settings-admin');
// Check if an adminRecovery account is enabled for recovering files after lost pwd // Check if an adminRecovery account is enabled for recovering files after lost pwd
$view = new OC_FilesystemView( '' ); $view = new OC_FilesystemView('');
$recoveryAdminEnabled = OC_Appconfig::getValue( 'files_encryption', 'recoveryAdminEnabled' ); $recoveryAdminEnabled = OC_Appconfig::getValue('files_encryption', 'recoveryAdminEnabled');
$tmpl->assign( 'recoveryEnabled', $recoveryAdminEnabled ); $tmpl->assign('recoveryEnabled', $recoveryAdminEnabled);
\OCP\Util::addscript( 'files_encryption', 'settings-admin' ); \OCP\Util::addscript('files_encryption', 'settings-admin');
\OCP\Util::addscript( 'core', 'multiselect' ); \OCP\Util::addscript('core', 'multiselect');
return $tmpl->fetchPage(); return $tmpl->fetchPage();

@ -7,22 +7,22 @@
*/ */
// Add CSS stylesheet // Add CSS stylesheet
\OC_Util::addStyle( 'files_encryption', 'settings-personal' ); \OC_Util::addStyle('files_encryption', 'settings-personal');
$tmpl = new OCP\Template( 'files_encryption', 'settings-personal'); $tmpl = new OCP\Template('files_encryption', 'settings-personal');
$user = \OCP\USER::getUser(); $user = \OCP\USER::getUser();
$view = new \OC_FilesystemView( '/' ); $view = new \OC_FilesystemView('/');
$util = new \OCA\Encryption\Util( $view, $user ); $util = new \OCA\Encryption\Util($view, $user);
$recoveryAdminEnabled = OC_Appconfig::getValue( 'files_encryption', 'recoveryAdminEnabled' ); $recoveryAdminEnabled = OC_Appconfig::getValue('files_encryption', 'recoveryAdminEnabled');
$recoveryEnabledForUser = $util->recoveryEnabledForUser(); $recoveryEnabledForUser = $util->recoveryEnabledForUser();
\OCP\Util::addscript( 'files_encryption', 'settings-personal' ); \OCP\Util::addscript('files_encryption', 'settings-personal');
\OCP\Util::addScript( 'settings', 'personal' ); \OCP\Util::addScript('settings', 'personal');
$tmpl->assign( 'recoveryEnabled', $recoveryAdminEnabled ); $tmpl->assign('recoveryEnabled', $recoveryAdminEnabled);
$tmpl->assign( 'recoveryEnabledForUser', $recoveryEnabledForUser ); $tmpl->assign('recoveryEnabledForUser', $recoveryEnabledForUser);
return $tmpl->fetchPage(); return $tmpl->fetchPage();

Loading…
Cancel
Save