holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added wrapper for xajax.addScriptCall(), added ?cd=10 to json.php response again

Browse Source
This commit is contained in:
Andreas Stöckel 2010-06-11 11:41:12 +00:00
parent 88583e9ebf
commit d8983b6cd1
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
json.php
View File

@ -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();

10
phpgwapi/inc/class.egw_json.inc.php
View File

@ -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 xajaxResponse extends 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 '';