changed redirect handling
This commit is contained in:
parent
b46e7323ec
commit
ef97481a0d
|
@ -0,0 +1,18 @@
|
||||||
|
<?php
|
||||||
|
if (!isset($_)) { //also provide standalone error page
|
||||||
|
require_once '../../../lib/base.php';
|
||||||
|
|
||||||
|
$l = OC_L10N::get('files_encryption');
|
||||||
|
|
||||||
|
// check if ajax request
|
||||||
|
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.'))));
|
||||||
|
} else {
|
||||||
|
header('HTTP/1.0 404 ' . $l->t('Your private key is not valid! Maybe the your password was changed from outside.'));
|
||||||
|
$tmpl = new OC_Template('files_encryption', 'invalid_private_key', 'guest');
|
||||||
|
$tmpl->printPage();
|
||||||
|
}
|
||||||
|
|
||||||
|
exit;
|
||||||
|
}
|
||||||
|
?>
|
|
@ -194,4 +194,13 @@ class Helper {
|
||||||
|
|
||||||
return $relPath;
|
return $relPath;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief redirect to a error page
|
||||||
|
*/
|
||||||
|
public static function redirectToErrorPage() {
|
||||||
|
$location = \OC_Helper::linkToAbsolute('apps/files_encryption/files', 'error.php');
|
||||||
|
header('Location: ' . $location);
|
||||||
|
exit();
|
||||||
|
}
|
||||||
}
|
}
|
|
@ -116,6 +116,11 @@ class Stream {
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
|
if($this->privateKey === false) {
|
||||||
|
// if private key is not valid redirect user to a error page
|
||||||
|
\OCA\Encryption\Helper::redirectToErrorPage();
|
||||||
|
}
|
||||||
|
|
||||||
$this->size = $this->rootView->filesize($this->rawPath, $mode);
|
$this->size = $this->rootView->filesize($this->rawPath, $mode);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -239,12 +244,8 @@ class Stream {
|
||||||
// if there is no valid private key return false
|
// if there is no valid private key return false
|
||||||
if ($this->privateKey === false) {
|
if ($this->privateKey === false) {
|
||||||
|
|
||||||
if (\OC_Util::isCallRegistered()) {
|
// if private key is not valid redirect user to a error page
|
||||||
$l = \OC_L10N::get('core');
|
\OCA\Encryption\Helper::redirectToErrorPage();
|
||||||
\OCP\JSON::error(array('data' => array('message' => $l->t('Private key is not valid! Maybe the user password was changed from outside if so please change it back to gain access'))));
|
|
||||||
throw new \Exception('Private key for user "' . $this->userId
|
|
||||||
. '" is not valid! Maybe the user password was changed from outside if so please change it back to gain access');
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@ -450,10 +451,6 @@ class Stream {
|
||||||
// if there is no valid private key return false
|
// if there is no valid private key return false
|
||||||
if ($this->privateKey === false) {
|
if ($this->privateKey === false) {
|
||||||
|
|
||||||
if (\OC_Util::isCallRegistered()) {
|
|
||||||
$l = \OC_L10N::get('core');
|
|
||||||
\OCP\JSON::error(array('data' => array('message' => $l->t('Private key is not valid! Maybe the user password was changed from outside if so please change it back to gain access'))));
|
|
||||||
|
|
||||||
// cleanup
|
// cleanup
|
||||||
if ($this->meta['mode'] !== 'r' && $this->meta['mode'] !== 'rb') {
|
if ($this->meta['mode'] !== 'r' && $this->meta['mode'] !== 'rb') {
|
||||||
|
|
||||||
|
@ -469,12 +466,8 @@ class Stream {
|
||||||
\OC_FileProxy::$enabled = $proxyStatus;
|
\OC_FileProxy::$enabled = $proxyStatus;
|
||||||
}
|
}
|
||||||
|
|
||||||
throw new \Exception('Private key for user "' . $this->userId
|
// if private key is not valid redirect user to a error page
|
||||||
. '" is not valid! Maybe the user password was changed from outside if so please change it back to gain access');
|
\OCA\Encryption\Helper::redirectToErrorPage();
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (
|
if (
|
||||||
|
|
|
@ -0,0 +1,10 @@
|
||||||
|
<ul>
|
||||||
|
<li class='error'>
|
||||||
|
<?php $location = \OC_Helper::linkToRoute( "settings_personal" ) ?>
|
||||||
|
|
||||||
|
<?php p($l->t('Your private key is not valid! Maybe the your password was changed from outside.')); ?>
|
||||||
|
<br/>
|
||||||
|
<?php p($l->t('You can unlock your private key in your ')); ?> <a href="<?php echo $location?>"><?php p($l->t('personal settings')); ?>.</a>
|
||||||
|
<br/>
|
||||||
|
</li>
|
||||||
|
</ul>
|
Loading…
Reference in New Issue