mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-01-15 18:38:57 +01:00
make sure the mbstring supports get always enabled. It's needed for the imap conversion(utf-7 => systemcharset).
This commit is contained in:
parent
8108d69dec
commit
66a207d455
@ -56,41 +56,31 @@
|
|||||||
*/
|
*/
|
||||||
function translation($warnings = False)
|
function translation($warnings = False)
|
||||||
{
|
{
|
||||||
for ($i = 1; $i <= 9; $i++)
|
for ($i = 1; $i <= 9; $i++) {
|
||||||
{
|
|
||||||
$this->placeholders[] = '%'.$i;
|
$this->placeholders[] = '%'.$i;
|
||||||
}
|
}
|
||||||
$this->db = is_object($GLOBALS['egw']->db) ? $GLOBALS['egw']->db : $GLOBALS['egw_setup']->db;
|
$this->db = is_object($GLOBALS['egw']->db) ? $GLOBALS['egw']->db : $GLOBALS['egw_setup']->db;
|
||||||
if (is_object($this->db)) $this->db->set_app('phpgwapi');
|
if (is_object($this->db)) $this->db->set_app('phpgwapi');
|
||||||
|
|
||||||
if (!isset($GLOBALS['egw_setup']))
|
if (!isset($GLOBALS['egw_setup'])) {
|
||||||
{
|
|
||||||
$this->system_charset = @$GLOBALS['egw_info']['server']['system_charset'];
|
$this->system_charset = @$GLOBALS['egw_info']['server']['system_charset'];
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
$this->system_charset =& $GLOBALS['egw_setup']->system_charset;
|
$this->system_charset =& $GLOBALS['egw_setup']->system_charset;
|
||||||
}
|
}
|
||||||
// load multi-byte-string-extension if needed, and set its internal encodeing to your system_charset
|
|
||||||
if ($this->system_charset && substr($this->system_charset,0,9) != 'iso-8859-1')
|
if (extension_loaded('mbstring') || @dl(PHP_SHLIB_PREFIX.'mbstring.'.PHP_SHLIB_SUFFIX)) {
|
||||||
{
|
$this->mbstring = true;
|
||||||
if ($this->mbstring = extension_loaded('mbstring') || @dl(PHP_SHLIB_PREFIX.'mbstring.'.PHP_SHLIB_SUFFIX))
|
if(!empty($this->system_charset)) {
|
||||||
{
|
|
||||||
ini_set('mbstring.internal_encoding',$this->system_charset);
|
ini_set('mbstring.internal_encoding',$this->system_charset);
|
||||||
if (ini_get('mbstring.func_overload') < 7)
|
}
|
||||||
{
|
if (ini_get('mbstring.func_overload') < 7) {
|
||||||
if ($warnings)
|
if ($warnings) {
|
||||||
{
|
echo "<p>Warning: Please set <b>mbstring.func_overload = 7</b> in your php.ini for useing <b>$this->system_charset</b> as your charset !!!</p>\n";
|
||||||
echo "<p>Warning: Please set <b>mbstring.func_overload = 7</b> in your php.ini for useing <b>$this->system_charset</b> as your charset !!!</p>\n";
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
} else {
|
||||||
{
|
if ($warnings) {
|
||||||
if ($warnings)
|
echo "<p>Warning: Please get and/or enable the <b>mbstring extension</b> in your php.ini for useing <b>$this->system_charset</b> as your charset, we are defaulting to <b>iconv</b> for now !!!</p>\n";
|
||||||
{
|
|
||||||
echo "<p>Warning: Please get and/or enable the <b>mbstring extension</b> in your php.ini for useing <b>$this->system_charset</b> as your charset, we are defaulting to <b>iconv</b> for now !!!</p>\n";
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user