extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-25 16:19:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Try to fix redirects from AJAX calls to static methods

Browse Source
This commit is contained in:
nathangray 2016-09-09 10:27:14 -06:00
parent 676148ba94
commit 4dcb415f44
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
api/src/Etemplate/Request.php
View File

@ -192,8 +192,18 @@ class Request
if (!$request) // eT2 request/session expired if (!$request) // eT2 request/session expired
{ {
list($app) = explode('.', $_GET['menuaction']); list($app) = explode('.', $_GET['menuaction']);
$global = false;
if(isset($GLOBALS['egw_info']['apps'][$app]))
{
$index_url = isset($GLOBALS['egw_info']['apps'][$app]['index']) ? $index_url = isset($GLOBALS['egw_info']['apps'][$app]['index']) ?
'/index.php?menuaction='.$GLOBALS['egw_info']['apps'][$app]['index'] : '/'.$app.'/index.php'; '/index.php?menuaction='.$GLOBALS['egw_info']['apps'][$app]['index'] : '/'.$app.'/index.php';
}
else
{
$index_url = '/index.php';
$global = true;
$app = null;
}
// add a unique token to redirect to avoid client-side framework tries refreshing via nextmatch // add a unique token to redirect to avoid client-side framework tries refreshing via nextmatch
$index_url .= (strpos($index_url, '?') ? '&' : '?').'redirect='.microtime(true); $index_url .= (strpos($index_url, '?') ? '&' : '?').'redirect='.microtime(true);
error_log(__METHOD__."('$id', ...) eT2 request not found / expired --> redirecting app $app to $index_url (_GET[menuaction]=$_GET[menuaction], isJSONRequest()=".array2string(Api\Json\Request::isJSONRequest()).')'); error_log(__METHOD__."('$id', ...) eT2 request not found / expired --> redirecting app $app to $index_url (_GET[menuaction]=$_GET[menuaction], isJSONRequest()=".array2string(Api\Json\Request::isJSONRequest()).')');
@ -203,7 +213,7 @@ class Request
if (strpos($_GET['menuaction'], '.ajax_destroy_session.etemplate') === false) if (strpos($_GET['menuaction'], '.ajax_destroy_session.etemplate') === false)
{ {
$response = Api\Json\Response::get(); $response = Api\Json\Response::get();
$response->redirect($index_url, false, $app); $response->redirect($index_url, $global, $app);
exit; exit;
} }
} }