@@ -55,7 +55,6 @@ |
||
| 55 | 55 | |
| 56 | 56 | /** |
| 57 | 57 | * @param array $urlParams |
| 58 | - * @param bool $encryptionSystemReady |
|
| 59 | 58 | */ |
| 60 | 59 | public function __construct($urlParams = array()) { |
| 61 | 60 | parent::__construct('encryption', $urlParams); |
@@ -130,7 +130,7 @@ discard block |
||
| 130 | 130 | $container = $this->getContainer(); |
| 131 | 131 | |
| 132 | 132 | $container->registerService('Crypt', |
| 133 | - function (IAppContainer $c) { |
|
| 133 | + function(IAppContainer $c) { |
|
| 134 | 134 | $server = $c->getServer(); |
| 135 | 135 | return new Crypt($server->getLogger(), |
| 136 | 136 | $server->getUserSession(), |
@@ -139,14 +139,14 @@ discard block |
||
| 139 | 139 | }); |
| 140 | 140 | |
| 141 | 141 | $container->registerService('Session', |
| 142 | - function (IAppContainer $c) { |
|
| 142 | + function(IAppContainer $c) { |
|
| 143 | 143 | $server = $c->getServer(); |
| 144 | 144 | return new Session($server->getSession()); |
| 145 | 145 | } |
| 146 | 146 | ); |
| 147 | 147 | |
| 148 | 148 | $container->registerService('KeyManager', |
| 149 | - function (IAppContainer $c) { |
|
| 149 | + function(IAppContainer $c) { |
|
| 150 | 150 | $server = $c->getServer(); |
| 151 | 151 | |
| 152 | 152 | return new KeyManager($server->getEncryptionKeyStorage(), |
@@ -160,7 +160,7 @@ discard block |
||
| 160 | 160 | }); |
| 161 | 161 | |
| 162 | 162 | $container->registerService('Recovery', |
| 163 | - function (IAppContainer $c) { |
|
| 163 | + function(IAppContainer $c) { |
|
| 164 | 164 | $server = $c->getServer(); |
| 165 | 165 | |
| 166 | 166 | return new Recovery( |
@@ -174,7 +174,7 @@ discard block |
||
| 174 | 174 | new View()); |
| 175 | 175 | }); |
| 176 | 176 | |
| 177 | - $container->registerService('RecoveryController', function (IAppContainer $c) { |
|
| 177 | + $container->registerService('RecoveryController', function(IAppContainer $c) { |
|
| 178 | 178 | $server = $c->getServer(); |
| 179 | 179 | return new RecoveryController( |
| 180 | 180 | $c->getAppName(), |
@@ -184,7 +184,7 @@ discard block |
||
| 184 | 184 | $c->query('Recovery')); |
| 185 | 185 | }); |
| 186 | 186 | |
| 187 | - $container->registerService('StatusController', function (IAppContainer $c) { |
|
| 187 | + $container->registerService('StatusController', function(IAppContainer $c) { |
|
| 188 | 188 | $server = $c->getServer(); |
| 189 | 189 | return new StatusController( |
| 190 | 190 | $c->getAppName(), |
@@ -195,7 +195,7 @@ discard block |
||
| 195 | 195 | ); |
| 196 | 196 | }); |
| 197 | 197 | |
| 198 | - $container->registerService('SettingsController', function (IAppContainer $c) { |
|
| 198 | + $container->registerService('SettingsController', function(IAppContainer $c) { |
|
| 199 | 199 | $server = $c->getServer(); |
| 200 | 200 | return new SettingsController( |
| 201 | 201 | $c->getAppName(), |
@@ -212,7 +212,7 @@ discard block |
||
| 212 | 212 | }); |
| 213 | 213 | |
| 214 | 214 | $container->registerService('UserSetup', |
| 215 | - function (IAppContainer $c) { |
|
| 215 | + function(IAppContainer $c) { |
|
| 216 | 216 | $server = $c->getServer(); |
| 217 | 217 | return new Setup($server->getLogger(), |
| 218 | 218 | $server->getUserSession(), |
@@ -221,7 +221,7 @@ discard block |
||
| 221 | 221 | }); |
| 222 | 222 | |
| 223 | 223 | $container->registerService('Util', |
| 224 | - function (IAppContainer $c) { |
|
| 224 | + function(IAppContainer $c) { |
|
| 225 | 225 | $server = $c->getServer(); |
| 226 | 226 | |
| 227 | 227 | return new Util( |
@@ -234,7 +234,7 @@ discard block |
||
| 234 | 234 | }); |
| 235 | 235 | |
| 236 | 236 | $container->registerService('EncryptAll', |
| 237 | - function (IAppContainer $c) { |
|
| 237 | + function(IAppContainer $c) { |
|
| 238 | 238 | $server = $c->getServer(); |
| 239 | 239 | return new EncryptAll( |
| 240 | 240 | $c->query('UserSetup'), |
@@ -252,7 +252,7 @@ discard block |
||
| 252 | 252 | ); |
| 253 | 253 | |
| 254 | 254 | $container->registerService('DecryptAll', |
| 255 | - function (IAppContainer $c) { |
|
| 255 | + function(IAppContainer $c) { |
|
| 256 | 256 | return new DecryptAll( |
| 257 | 257 | $c->query('Util'), |
| 258 | 258 | $c->query('KeyManager'), |
@@ -72,28 +72,28 @@ |
||
| 72 | 72 | |
| 73 | 73 | $status = 'error'; |
| 74 | 74 | $message = 'no valid init status'; |
| 75 | - switch( $this->session->getStatus()) { |
|
| 75 | + switch ($this->session->getStatus()) { |
|
| 76 | 76 | case Session::INIT_EXECUTED: |
| 77 | 77 | $status = 'interactionNeeded'; |
| 78 | - $message = (string)$this->l->t( |
|
| 78 | + $message = (string) $this->l->t( |
|
| 79 | 79 | 'Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files.' |
| 80 | 80 | ); |
| 81 | 81 | break; |
| 82 | 82 | case Session::NOT_INITIALIZED: |
| 83 | 83 | $status = 'interactionNeeded'; |
| 84 | 84 | if ($this->encryptionManager->isEnabled()) { |
| 85 | - $message = (string)$this->l->t( |
|
| 85 | + $message = (string) $this->l->t( |
|
| 86 | 86 | 'Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again.' |
| 87 | 87 | ); |
| 88 | 88 | } else { |
| 89 | - $message = (string)$this->l->t( |
|
| 89 | + $message = (string) $this->l->t( |
|
| 90 | 90 | 'Please enable server side encryption in the admin settings in order to use the encryption module.' |
| 91 | 91 | ); |
| 92 | 92 | } |
| 93 | 93 | break; |
| 94 | 94 | case Session::INIT_SUCCESSFUL: |
| 95 | 95 | $status = 'success'; |
| 96 | - $message = (string)$this->l->t('Encryption app is enabled and ready'); |
|
| 96 | + $message = (string) $this->l->t('Encryption app is enabled and ready'); |
|
| 97 | 97 | } |
| 98 | 98 | |
| 99 | 99 | return new DataResponse( |