Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

All data from conf file are stored into conf->file->xxx

Browse Source 
Multicompany should be ok to logon with no breaking sessions when disabled
This commit is contained in:
Laurent Destailleur
2009-05-08 01:11:04 +00:00
parent 14afe7a82f
commit cbdd29a51a
23 changed files with 70 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/lib/ldap.class.php
View File

@@ -1109,8 +1109,8 @@ class Ldap
function convToOutputCharset($str,$pagecodefrom='UTF-8')
{
global $conf;
if ($pagecodefrom == 'ISO-8859-1' && $conf->character_set_client == 'UTF-8') $str=utf8_encode($str);
if ($pagecodefrom == 'UTF-8' && $conf->character_set_client == 'ISO-8859-1') $str=utf8_decode($str);
if ($pagecodefrom == 'ISO-8859-1' && $conf->file->character_set_client == 'UTF-8') $str=utf8_encode($str);
if ($pagecodefrom == 'UTF-8' && $conf->file->character_set_client == 'ISO-8859-1') $str=utf8_decode($str);
return $str;
}
@@ -1123,8 +1123,8 @@ class Ldap
function convFromOutputCharset($str,$pagecodeto='UTF-8')
{
global $conf;
if ($pagecodeto == 'ISO-8859-1' && $conf->character_set_client == 'UTF-8') $str=utf8_decode($str);
if ($pagecodeto == 'UTF-8' && $conf->character_set_client == 'ISO-8859-1') $str=utf8_encode($str);
if ($pagecodeto == 'ISO-8859-1' && $conf->file->character_set_client == 'UTF-8') $str=utf8_decode($str);
if ($pagecodeto == 'UTF-8' && $conf->file->character_set_client == 'ISO-8859-1') $str=utf8_encode($str);
return $str;
}
}