diff --git a/json.php b/json.php index 6829791743..4cb94d984e 100644 --- a/json.php +++ b/json.php @@ -19,7 +19,7 @@ function xajax_redirect(&$anon_account) { $response = new egw_json_response(); - $response->redirect($GLOBALS['egw_info']['server']['webserver_url'].'/login.php', true); + $response->redirect($GLOBALS['egw_info']['server']['webserver_url'].'/login.php?cd=10', true); $response->printOutput(); common::egw_exit(); diff --git a/phpgwapi/inc/class.egw_json.inc.php b/phpgwapi/inc/class.egw_json.inc.php index b9b564f515..f1ae1a7f13 100644 --- a/phpgwapi/inc/class.egw_json.inc.php +++ b/phpgwapi/inc/class.egw_json.inc.php @@ -54,7 +54,7 @@ class egw_json_request //Call the supplied callback function along with the menuaction and the passed parameters $this->handleRequest($menuaction, $parameters); } - } + } return NULL; } @@ -382,6 +382,14 @@ class egw_json_response $this->redirect($url); } + public function addScriptCall($func) + { + $args = func_get_args(); + $func = array_shift($args); + + $this->script("$func(".implode(",", $args).");"); + } + public function getXML() { return '';