mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-21 23:43:17 +01:00
Added wrapper for xajax.addScriptCall(), added ?cd=10 to json.php response again
This commit is contained in:
parent
88583e9ebf
commit
d8983b6cd1
2
json.php
2
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();
|
||||
|
@ -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 '';
|
||||
|
Loading…
Reference in New Issue
Block a user