wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #15699 from owncloud/fix-15696-master

Browse source 
Fix 15696 master
This commit is contained in:
Thomas Müller 2015-04-17 17:36:07 +02:00
commit f2fe9fffd9
1 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
apps/encryption/controller/statuscontroller.php
View file

@ -59,30 +59,29 @@ class StatusController extends Controller {
*/
public function getStatus() {
$status = 'error';
$message = '';
switch( $this->session->getStatus()) {
case Session::INIT_EXECUTED:
$status = 'success';
$message = (string)$this->l->t(
'Invalid private key for Encryption App. Please update your private'
. ' key password in your personal settings to recover access to your'
. ' encrypted files.', array('app' => 'encryption'));
'Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files.'
);
break;
case Session::NOT_INITIALIZED:
$status = 'success';
$message = (string)$this->l->t(
'Encryption App is enabled but your keys are not initialized,'
. ' please log-out and log-in again', array('app' => 'encryption'));
'Encryption App is enabled but your keys are not initialized, please log-out and log-in again'
);
break;
default:
$status = 'error';
}
return new DataResponse(
array(
[
'status' => $status,
'data' => array(
'message' => $message)
)
'data' => [
'message' => $message]
]
);
}