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

printOutput need no echoing and no headers, does it by itself

Browse Source
This commit is contained in:
Ralf Becker 2010-01-14 22:35:13 +00:00
parent 2e71e7e80f
commit 89311a8e7f
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
xajax.php
View File

@ -26,10 +26,9 @@ function xajax_redirect(&$anon_account)
define('XAJAX_DEFAULT_CHAR_ENCODING',translation::charset()); define('XAJAX_DEFAULT_CHAR_ENCODING',translation::charset());
$response = new xajaxResponse(); $response = new xajaxResponse();
$response->addScript("location.href='".$GLOBALS['egw_info']['server']['webserver_url'].'/login.php?cd=10'."';"); $response->redirect($GLOBALS['egw_info']['server']['webserver_url'].'/login.php?cd=10');
$response->printOutput();
header('Content-type: text/xml; charset='.translation::charset());
echo $response->printOutput;
common::egw_exit(); common::egw_exit();
} }
@ -44,8 +43,8 @@ function ajax_exception_handler(Exception $e)
{ {
$response = new xajaxResponse(); $response = new xajaxResponse();
$response->addAlert($e->getMessage()."\n\n".$e->getTraceAsString()); $response->addAlert($e->getMessage()."\n\n".$e->getTraceAsString());
header('Content-type: text/xml; charset='.(is_object($GLOBALS['egw'])?translation::charset():'utf-8')); $response->printOutput();
echo $response->printOutput();
if (is_object($GLOBALS['egw'])) if (is_object($GLOBALS['egw']))
{ {
common::egw_exit(); common::egw_exit();
@ -126,7 +125,7 @@ function doXMLHTTP()
$argList[0], $argList[0],
'xajaxResponse', 'xajaxResponse',
); );
error_log("xajax_doXMLHTTP() /etemplate/process_exec handler: arg0='$arg0', menuaction='$_GET[menuaction]'"); //error_log("xajax_doXMLHTTP() /etemplate/process_exec handler: arg0='$arg0', menuaction='$_GET[menuaction]'");
break; break;
case 'etemplate': // eg. ajax code in an eTemplate widget case 'etemplate': // eg. ajax code in an eTemplate widget
$arg0 = ($appName = 'etemplate').'.'.$className.'.'.$functionName; $arg0 = ($appName = 'etemplate').'.'.$className.'.'.$functionName;
@ -143,7 +142,7 @@ function doXMLHTTP()
exit; exit;
} }
$ajaxClass =& CreateObject($appName.'.'.$className); $ajaxClass =& CreateObject($appName.'.'.$className);
$argList = $GLOBALS['egw']->translation->convert($argList, 'utf-8'); $argList = translation::convert($argList, 'utf-8');
return call_user_func_array(array(&$ajaxClass, $functionName), (array)$argList ); return call_user_func_array(array(&$ajaxClass, $functionName), (array)$argList );
} }