mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

improved error msg and removed duplicate string

This commit is contained in:
Florin Peter 2013-06-04 22:31:36 +02:00
parent 7bbd85b6e5
commit 055c901091
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/files_encryption/files/error.php
View File

@ -4,15 +4,17 @@ if (!isset($_)) { //also provide standalone error page
$l = OC_L10N::get('files_encryption'); $l = OC_L10N::get('files_encryption');
$errorMsg = $l->t('Your private key is not valid! Maybe your password was changed from outside.');
if(isset($_GET['p']) && $_GET['p'] === '1') { if(isset($_GET['p']) && $_GET['p'] === '1') {
header('HTTP/1.0 404 ' . $l->t('Your private key is not valid! Maybe the your password was changed from outside.')); header('HTTP/1.0 404 ' . $errorMsg);
} }
// check if ajax request // check if ajax request
if(!empty($_SERVER['HTTP_X_REQUESTED_WITH']) && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest') { if(!empty($_SERVER['HTTP_X_REQUESTED_WITH']) && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest') {
\OCP\JSON::error(array('data' => array('message' => $l->t('Your private key is not valid! Maybe the your password was changed from outside.')))); \OCP\JSON::error(array('data' => array('message' => $errorMsg)));
} else { } else {
header('HTTP/1.0 404 ' . $l->t('Your private key is not valid! Maybe the your password was changed from outside.')); header('HTTP/1.0 404 ' . $errorMsg);
$tmpl = new OC_Template('files_encryption', 'invalid_private_key', 'guest'); $tmpl = new OC_Template('files_encryption', 'invalid_private_key', 'guest');
$tmpl->printPage(); $tmpl->printPage();
} }