extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-23 05:41:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

setting the correct charset for the new xajax version

Browse Source
This commit is contained in:
Ralf Becker 2006-08-24 11:14:25 +00:00
parent e53b4f7b17
commit 2229fae121
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
phpgwapi/inc/xajax.inc.php
View File

@ -41,14 +41,17 @@
---------------------------------------------------------------------------- ----------------------------------------------------------------------------
*/ */
/** // RalfBecker: We can't allow to define the charset "now", as the eGW header is not yet included
* Define XAJAX_DEFAULT_CHAR_ENCODING that is used by both // and we dont know the charset at this moment. It will be set in xajax.php after the header include!
* the xajax and xajaxResponse classes // Please note: The use of this constant is also removed from the constructor further down!
*/ ///**
if (!defined ('XAJAX_DEFAULT_CHAR_ENCODING')) // * Define XAJAX_DEFAULT_CHAR_ENCODING that is used by both
{ // * the xajax and xajaxResponse classes
define ('XAJAX_DEFAULT_CHAR_ENCODING', 'utf-8' ); // */
} //if (!defined ('XAJAX_DEFAULT_CHAR_ENCODING'))
//{
// define ('XAJAX_DEFAULT_CHAR_ENCODING', 'utf-8' );
//}
require_once(dirname(__FILE__)."/xajaxResponse.inc.php"); require_once(dirname(__FILE__)."/xajaxResponse.inc.php");
@ -169,7 +172,9 @@ class xajax
* @param string defaults to XAJAX_DEFAULT_CHAR_ENCODING defined above * @param string defaults to XAJAX_DEFAULT_CHAR_ENCODING defined above
* @param boolean defaults to false * @param boolean defaults to false
*/ */
function xajax($sRequestURI="",$sWrapperPrefix="xajax_",$sEncoding=XAJAX_DEFAULT_CHAR_ENCODING,$bDebug=false) // RalfBecker: using the not yet defined constant XAJAX_DEFAULT_CHAR_ENCODING, results in a warning, which messes up the xml
// function xajax($sRequestURI="",$sWrapperPrefix="xajax_",$sEncoding=XAJAX_DEFAULT_CHAR_ENCODING,$bDebug=false)
function xajax($sRequestURI="",$sWrapperPrefix="xajax_",$sEncoding='utf-8',$bDebug=false)
{ {
$this->aFunctions = array(); $this->aFunctions = array();
$this->aObjects = array(); $this->aObjects = array();

5
xajax.php
View File

@ -21,6 +21,10 @@
*/ */
function xajax_redirect(&$anon_account) function xajax_redirect(&$anon_account)
{ {
// now the header is included, we can set the charset
$GLOBALS['xajax']->setCharEncoding($GLOBALS['egw']->translation->charset());
define('XAJAX_DEFAULT_CHAR_ENCODING',$GLOBALS['egw']->translation->charset());
$response =& new xajaxResponse(); $response =& new xajaxResponse();
$response->addScript("location.href='".$GLOBALS['egw_info']['server']['webserver_url'].'/login.php?cd=10'."';"); $response->addScript("location.href='".$GLOBALS['egw_info']['server']['webserver_url'].'/login.php?cd=10'."';");
@ -71,6 +75,7 @@
// now the header is included, we can set the charset // now the header is included, we can set the charset
$GLOBALS['xajax']->setCharEncoding($GLOBALS['egw']->translation->charset()); $GLOBALS['xajax']->setCharEncoding($GLOBALS['egw']->translation->charset());
define('XAJAX_DEFAULT_CHAR_ENCODING',$GLOBALS['egw']->translation->charset());
$ajaxClass =& CreateObject($appName.'.'.$className); $ajaxClass =& CreateObject($appName.'.'.$className);
$argList = $GLOBALS['egw']->translation->convert($argList, 'utf-8'); $argList = $GLOBALS['egw']->translation->convert($argList, 'utf-8');