diff --git a/htdocs/admin/barcode.php b/htdocs/admin/barcode.php index 69f651f3bb7..cb56c1bee68 100644 --- a/htdocs/admin/barcode.php +++ b/htdocs/admin/barcode.php @@ -84,7 +84,7 @@ $barcodelist=array(); clearstatcache(); -foreach ($conf->dol_document_root as $dirroot) +foreach ($conf->file->dol_document_root as $dirroot) { $dir = $dirroot . "/includes/modules/barcode/"; diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php index b9c513289f0..7046e412dba 100644 --- a/htdocs/admin/modules.php +++ b/htdocs/admin/modules.php @@ -78,7 +78,7 @@ function Activate($value,$withdeps=1) $file = $modName . ".class.php"; // Loop on each directory - foreach ($conf->dol_document_root as $dol_document_root) + foreach ($conf->file->dol_document_root as $dol_document_root) { $found=@include_once($dol_document_root."/includes/modules/".$file); if ($found) break; @@ -144,7 +144,7 @@ function UnActivate($value,$requiredby=1) $file = $modName . ".class.php"; // Loop on each directory - foreach ($conf->dol_document_root as $dol_document_root) + foreach ($conf->file->dol_document_root as $dol_document_root) { $found=@include_once($dol_document_root."/includes/modules/".$file); if ($found) break; @@ -198,7 +198,7 @@ $categ = array(); $dirmod = array(); $i = 0; // is a sequencer of modules found $j = 0; // j is module number. Automatically affeted if module number not defined. -foreach ($conf->dol_document_root as $dirroot) +foreach ($conf->file->dol_document_root as $dirroot) { $dir = $dirroot . "/includes/modules/"; diff --git a/htdocs/admin/perms.php b/htdocs/admin/perms.php index 7820c9aa6b9..8af1d9ad7e1 100644 --- a/htdocs/admin/perms.php +++ b/htdocs/admin/perms.php @@ -79,7 +79,7 @@ $db->begin(); // Charge les modules soumis a permissions $modules = array(); -foreach ($conf->dol_document_root as $dirroot) +foreach ($conf->file->dol_document_root as $dirroot) { $dir = $dirroot . "/includes/modules/"; diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php index ad80e2e6c6c..3ad9476a92b 100644 --- a/htdocs/comm/mailing/cibles.php +++ b/htdocs/comm/mailing/cibles.php @@ -62,7 +62,7 @@ if ($_GET["action"] == 'add') $result=0; $var=true; - foreach ($conf->dol_document_root as $dirmod) + foreach ($conf->file->dol_document_root as $dirmod) { $dir=$dirmod."/includes/modules/mailings/"; @@ -209,7 +209,7 @@ if ($mil->fetch($_REQUEST["id"]) >= 0) clearstatcache(); $var=true; - foreach ($conf->dol_document_root as $dirroot) + foreach ($conf->file->dol_document_root as $dirroot) { $dir=$dirroot."/includes/modules/mailings/"; diff --git a/htdocs/core/conf.class.php b/htdocs/core/conf.class.php index 9307ae0d26f..cfc29d6b9da 100644 --- a/htdocs/core/conf.class.php +++ b/htdocs/core/conf.class.php @@ -62,7 +62,6 @@ class Conf /** * \brief Load setup values into conf object * \param $db Handler d'acces base - * \param $entity Id of company * \return int < 0 if KO, >= 0 if OK */ function setValues($db) diff --git a/htdocs/includes/boxes/box_external_rss.php b/htdocs/includes/boxes/box_external_rss.php index 78af3c636d6..b1e38ff9267 100644 --- a/htdocs/includes/boxes/box_external_rss.php +++ b/htdocs/includes/boxes/box_external_rss.php @@ -132,8 +132,8 @@ class box_external_rss extends ModeleBoxes { if (is_numeric($date)) $date=dol_print_date($date,"dayhour"); $isutf8 = utf8_check($title); - if (! $isutf8 && $conf->character_set_client == 'UTF-8') $title=utf8_encode($title); - elseif ($isutf8 && $conf->character_set_client == 'ISO-8859-1') $title=utf8_decode($title); + if (! $isutf8 && $conf->file->character_set_client == 'UTF-8') $title=utf8_encode($title); + elseif ($isutf8 && $conf->file->character_set_client == 'ISO-8859-1') $title=utf8_decode($title); $title=ereg_replace("([[:alnum:]])\?([[:alnum:]])","\\1'\\2",$title); // Gère problème des apostrophes mal codée/décodée par utf8 $title=ereg_replace("^\s+","",$title); // Supprime espaces de début diff --git a/htdocs/includes/modules/DolibarrModules.class.php b/htdocs/includes/modules/DolibarrModules.class.php index 4312a69be2d..a3fb2bf2c40 100644 --- a/htdocs/includes/modules/DolibarrModules.class.php +++ b/htdocs/includes/modules/DolibarrModules.class.php @@ -273,7 +273,7 @@ class DolibarrModules function getDbVersion() { global $langs,$conf; - + $langs->load("admin"); $sql ="SELECT active_version"; @@ -346,13 +346,13 @@ class DolibarrModules function _dbactive() { global $conf; - + $err = 0; $sql = "DELETE FROM ".MAIN_DB_PREFIX."dolibarr_modules"; $sql.= " WHERE numero = ".$this->numero; $sql.= " AND entity = ".$conf->entity; - + dol_syslog("DolibarrModules::_dbactive sql=".$sql, LOG_DEBUG); $this->db->query($sql); @@ -370,7 +370,7 @@ class DolibarrModules $sql.= ", ".$this->db->idate(gmmktime()); $sql.= ", '".$this->version."'"; $sql.= ")"; - + dol_syslog("DolibarrModules::_dbactive sql=".$sql, LOG_DEBUG); $this->db->query($sql); @@ -386,13 +386,13 @@ class DolibarrModules function _dbunactive() { global $conf; - + $err = 0; $sql = "DELETE FROM ".MAIN_DB_PREFIX."dolibarr_modules"; $sql.= " WHERE numero = ".$this->numero; $sql.= " AND entity = ".$conf->entity; - + dol_syslog("DolibarrModules::_dbunactive sql=".$sql, LOG_DEBUG); $this->db->query($sql); @@ -409,20 +409,20 @@ class DolibarrModules global $conf; $err = 0; - + // Common module $entity = ((isset($this->always_enabled)||isset($this->core_enabled)) ? 0 : $conf->entity); $sql = "DELETE FROM ".MAIN_DB_PREFIX."const"; $sql.= " WHERE name = '".$this->const_name."'"; $sql.= " AND entity = ".$entity; - + dol_syslog("DolibarrModules::_active sql=".$sql, LOG_DEBUG); $this->db->query($sql); $sql = "INSERT INTO ".MAIN_DB_PREFIX."const (name,value,visible,entity) VALUES"; $sql.= " ('".$this->const_name."','1',0,".$entity.")"; - + dol_syslog("DolibarrModules::_active sql=".$sql, LOG_DEBUG); if (!$this->db->query($sql)) { @@ -442,14 +442,14 @@ class DolibarrModules global $conf; $err = 0; - + // Common module $entity = (isset($this->core_enabled) ? 0 : $conf->entity); $sql = "DELETE FROM ".MAIN_DB_PREFIX."const"; $sql.= " WHERE name = '".$this->const_name."'"; $sql.= " AND entity = ".$entity; - + dol_syslog("DolibarrModules::_unactive sql=".$sql); $this->db->query($sql); @@ -471,7 +471,7 @@ class DolibarrModules include_once(DOL_DOCUMENT_ROOT ."/lib/admin.lib.php"); $ok = 1; - foreach($conf->dol_document_root as $dirroot) + foreach($conf->file->dol_document_root as $dirroot) { if ($ok) { @@ -538,7 +538,7 @@ class DolibarrModules $sql = "SELECT count(*) FROM ".MAIN_DB_PREFIX."boxes_def"; $sql.= " WHERE file = '".$file."'"; $sql.= " AND entity = ".$conf->entity; - + if ($note) $sql.=" AND note ='".addslashes($note)."'"; $result=$this->db->query($sql); @@ -552,7 +552,7 @@ class DolibarrModules $sql.= $conf->entity.","; $sql.= $note?"'".addslashes($note)."'":"null"; $sql.= ")"; - + dol_syslog("DolibarrModules::insert_boxes sql=".$sql); if (! $this->db->query($sql)) { @@ -594,14 +594,14 @@ class DolibarrModules $sql.= " WHERE ".MAIN_DB_PREFIX."boxes.box_id = ".MAIN_DB_PREFIX."boxes_def.rowid"; $sql.= " AND ".MAIN_DB_PREFIX."boxes_def.file = '".addslashes($file)."'"; $sql.= " AND ".MAIN_DB_PREFIX."boxes_def.entity = ".$conf->entity; - + dol_syslog("DolibarrModules::delete_boxes sql=".$sql); $this->db->query($sql); $sql = "DELETE FROM ".MAIN_DB_PREFIX."boxes_def"; $sql.= " WHERE file = '".addslashes($file)."'"; $sql.= " AND entity = ".$conf->entity; - + dol_syslog("DolibarrModules::delete_boxes sql=".$sql); if (! $this->db->query($sql)) { @@ -630,7 +630,7 @@ class DolibarrModules $sql = "DELETE FROM ".MAIN_DB_PREFIX."const"; $sql.= " WHERE name = '".$this->const_name."_CSS'"; $sql.= " AND entity = ".$conf->entity; - + dol_syslog("DolibarrModules::delete_style_sheet sql=".$sql); if (! $this->db->query($sql)) { @@ -656,7 +656,7 @@ class DolibarrModules $sql = "DELETE FROM ".MAIN_DB_PREFIX."const"; $sql.= " WHERE name like '".$this->const_name."_TABS_%'"; $sql.= " AND entity = ".$conf->entity; - + dol_syslog("DolibarrModules::delete_tabs sql=".$sql); if (! $this->db->query($sql)) { @@ -696,7 +696,7 @@ class DolibarrModules $sql.= ", '0'"; $sql.= ", ".$conf->entity; $sql.= ")"; - + dol_syslog("DolibarrModules::insert_style_sheet sql=".$sql); $resql=$this->db->query($sql); /* Allow duplicate key @@ -743,7 +743,7 @@ class DolibarrModules $sql.= ", '0'"; $sql.= ", ".$conf->entity; $sql.= ")"; - + dol_syslog("DolibarrModules::insert_tabs sql=".$sql); $resql=$this->db->query($sql); /* Allow duplicate key diff --git a/htdocs/install/etape2.php b/htdocs/install/etape2.php index f491130366a..76c15f535ce 100644 --- a/htdocs/install/etape2.php +++ b/htdocs/install/etape2.php @@ -154,7 +154,7 @@ if ($_POST["action"] == "set") //print "Creation de la table $name/td>"; $requestnb++; - if ($conf->character_set_client == "UTF-8") + if ($conf->file->character_set_client == "UTF-8") { $buffer=utf8_encode($buffer); } @@ -266,7 +266,7 @@ if ($_POST["action"] == "set") { //print "Creation des cles et index de la table $name: '$buffer'"; $requestnb++; - if ($conf->character_set_client == "UTF-8") + if ($conf->file->character_set_client == "UTF-8") { $buffer=utf8_encode($buffer); } diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php index 1ac5e2ed0aa..3371fb51cc7 100644 --- a/htdocs/install/inc.php +++ b/htdocs/install/inc.php @@ -115,7 +115,7 @@ if (! isset($dolibarr_main_db_prefix) || ! $dolibarr_main_db_prefix) $dolibarr_m define('MAIN_DB_PREFIX',(isset($dolibarr_main_db_prefix)?$dolibarr_main_db_prefix:'')); define('DOL_DATA_ROOT',(isset($dolibarr_main_data_root)?$dolibarr_main_data_root:'')); -if (empty($conf->character_set_client)) $conf->character_set_client="UTF-8"; +if (empty($conf->file->character_set_client)) $conf->file->character_set_client="UTF-8"; if (empty($conf->db->dolibarr_main_db_collation)) $conf->db->dolibarr_main_db_collation='latin1_swedish_ci'; if (empty($conf->db->user)) $conf->db->user=''; @@ -212,7 +212,7 @@ function conf($dolibarr_main_document_root) $conf->db->pass = trim($dolibarr_main_db_pass); if (empty($character_set_client)) $character_set_client="UTF-8"; - $conf->character_set_client=strtoupper($character_set_client); + $conf->file->character_set_client=strtoupper($character_set_client); if (empty($dolibarr_main_db_charset)) $dolibarr_main_db_charset='latin1'; $conf->db->character_set=$dolibarr_main_db_charset; if (empty($dolibarr_main_db_collation)) $dolibarr_main_db_collation='latin1_swedish_ci'; @@ -248,12 +248,12 @@ function pHeader($soutitre,$next,$action='set') $langs->load("admin"); // On force contenu dans format sortie - header("Content-type: text/html; charset=".$conf->character_set_client); + header("Content-type: text/html; charset=".$conf->file->character_set_client); print ''."\n"; print ''."\n"; print ''."\n"; - print ''."\n"; + print ''."\n"; print ''."\n"; print ''.$langs->trans("DolibarrSetup").''."\n"; print ''."\n"; diff --git a/htdocs/lib/CMailFile.class.php b/htdocs/lib/CMailFile.class.php index 99f599785a2..3eb8c0ac2c1 100644 --- a/htdocs/lib/CMailFile.class.php +++ b/htdocs/lib/CMailFile.class.php @@ -78,7 +78,7 @@ class CMailFile // If ending method not defined if (empty($conf->global->MAIN_MAIL_SENDMODE)) $conf->global->MAIN_MAIL_SENDMODE='mail'; - dol_syslog("CMailFile::CMailfile: MAIN_MAIL_SENDMODE=".$conf->global->MAIN_MAIL_SENDMODE." charset=".$conf->character_set_client." from=$from, to=$to, addr_cc=$addr_cc, addr_bcc=$addr_bcc, errors_to=$errors_to", LOG_DEBUG); + dol_syslog("CMailFile::CMailfile: MAIN_MAIL_SENDMODE=".$conf->global->MAIN_MAIL_SENDMODE." charset=".$conf->file->character_set_client." from=$from, to=$to, addr_cc=$addr_cc, addr_bcc=$addr_bcc, errors_to=$errors_to", LOG_DEBUG); dol_syslog("CMailFile::CMailfile: subject=$subject, deliveryreceipt=$deliveryreceipt, msgishtml=$msgishtml", LOG_DEBUG); // Detect if message is HTML (use fast method) @@ -162,7 +162,7 @@ class CMailFile require_once(DOL_DOCUMENT_ROOT."/includes/smtps/SMTPs.php"); $smtps = new SMTPs(); - $smtps->setCharSet($conf->character_set_client); + $smtps->setCharSet($conf->file->character_set_client); $smtps->setSubject($subject); $smtps->setTO($to); $smtps->setFrom($from); @@ -419,12 +419,12 @@ class CMailFile if ($this->msgishtml) { - if (! $this->atleastonefile) $out.= "Content-Type: text/html; charset=".$conf->character_set_client.$this->eol; + if (! $this->atleastonefile) $out.= "Content-Type: text/html; charset=".$conf->file->character_set_client.$this->eol; $out.= "Content-Transfer-Encoding: 8bit".$this->eol; } else { - if (! $this->atleastonefile) $out.= "Content-Type: text/plain; charset=".$conf->character_set_client.$this->eol; + if (! $this->atleastonefile) $out.= "Content-Type: text/plain; charset=".$conf->file->character_set_client.$this->eol; $out.= "Content-Transfer-Encoding: 8bit".$this->eol; } @@ -476,11 +476,11 @@ class CMailFile $out.= "--" . $this->mime_boundary . $this->eol; if ($this->msgishtml) { - $out.= "Content-Type: text/html; charset=".$conf->character_set_client.$this->eol; + $out.= "Content-Type: text/html; charset=".$conf->file->character_set_client.$this->eol; } else { - $out.= "Content-Type: text/plain; charset=".$conf->character_set_client.$this->eol; + $out.= "Content-Type: text/plain; charset=".$conf->file->character_set_client.$this->eol; } $out.= $this->eol; } diff --git a/htdocs/lib/databases/mysql.lib.php b/htdocs/lib/databases/mysql.lib.php index a695c2f5a24..a88b5a765fa 100644 --- a/htdocs/lib/databases/mysql.lib.php +++ b/htdocs/lib/databases/mysql.lib.php @@ -139,8 +139,8 @@ class DoliDb // If client connected with different charset than Dolibarr HTML output $clientmustbe=''; - if (eregi('UTF-8',$conf->character_set_client)) $clientmustbe='utf8'; - if (eregi('ISO-8859-1',$conf->character_set_client)) $clientmustbe='latin1'; + if (eregi('UTF-8',$conf->file->character_set_client)) $clientmustbe='utf8'; + if (eregi('ISO-8859-1',$conf->file->character_set_client)) $clientmustbe='latin1'; if (mysql_client_encoding($this->db) != $clientmustbe) { $this->query("SET NAMES '".$clientmustbe."'", $this->db); @@ -165,8 +165,8 @@ class DoliDb { // If client connected with different charset than Dolibarr HTML output $clientmustbe=''; - if (eregi('UTF-8',$conf->character_set_client)) $clientmustbe='utf8'; - if (eregi('ISO-8859-1',$conf->character_set_client)) $clientmustbe='latin1'; + if (eregi('UTF-8',$conf->file->character_set_client)) $clientmustbe='utf8'; + if (eregi('ISO-8859-1',$conf->file->character_set_client)) $clientmustbe='latin1'; if (mysql_client_encoding($this->db) != $clientmustbe) { $this->query("SET NAMES '".$clientmustbe."'", $this->db); diff --git a/htdocs/lib/databases/mysqli.lib.php b/htdocs/lib/databases/mysqli.lib.php index ed6ac87d217..cc89ceecb18 100644 --- a/htdocs/lib/databases/mysqli.lib.php +++ b/htdocs/lib/databases/mysqli.lib.php @@ -141,8 +141,8 @@ class DoliDb // If client connected with different charset than Dolibarr HTML output $clientmustbe=''; - if (eregi('UTF-8',$conf->character_set_client)) $clientmustbe='utf8'; - if (eregi('ISO-8859-1',$conf->character_set_client)) $clientmustbe='latin1'; + if (eregi('UTF-8',$conf->file->character_set_client)) $clientmustbe='utf8'; + if (eregi('ISO-8859-1',$conf->file->character_set_client)) $clientmustbe='latin1'; if (mysqli_client_encoding($this->db) != $clientmustbe) { $this->query("SET NAMES '".$clientmustbe."'", $this->db); @@ -167,8 +167,8 @@ class DoliDb { // If client connected with different charset than Dolibarr HTML output $clientmustbe=''; - if (eregi('UTF-8',$conf->character_set_client)) $clientmustbe='utf8'; - if (eregi('ISO-8859-1',$conf->character_set_client)) $clientmustbe='latin1'; + if (eregi('UTF-8',$conf->file->character_set_client)) $clientmustbe='utf8'; + if (eregi('ISO-8859-1',$conf->file->character_set_client)) $clientmustbe='latin1'; if (mysqli_client_encoding($this->db) != $clientmustbe) { $this->query("SET NAMES '".$clientmustbe."'", $this->db); diff --git a/htdocs/lib/databases/pgsql.lib.php b/htdocs/lib/databases/pgsql.lib.php index 924d88f76a2..2a4197318bf 100644 --- a/htdocs/lib/databases/pgsql.lib.php +++ b/htdocs/lib/databases/pgsql.lib.php @@ -72,7 +72,7 @@ class DoliDb { global $conf,$langs; - $this->forcecharset=$conf->character_set_client; + $this->forcecharset=$conf->file->character_set_client; $this->forcecollate=$conf->db->dolibarr_main_db_collation; $this->database_user=$user; diff --git a/htdocs/lib/ldap.class.php b/htdocs/lib/ldap.class.php index 860173f7be0..84754782d06 100644 --- a/htdocs/lib/ldap.class.php +++ b/htdocs/lib/ldap.class.php @@ -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; } } diff --git a/htdocs/lib/xcal.lib.php b/htdocs/lib/xcal.lib.php index 91a1ec3ff71..bd0ff9e1580 100644 --- a/htdocs/lib/xcal.lib.php +++ b/htdocs/lib/xcal.lib.php @@ -331,13 +331,13 @@ function build_rssfile($format='rss',$title,$desc,$events_array,$outputfile,$fil * \param format vcal or ical * \param string string to encode * \return string string encoded - * \remarks string must be encoded in conf->character_set_client + * \remarks string must be encoded in conf->file->character_set_client */ function format_cal($format,$string) { global $conf; - if ($conf->character_set_client == 'ISO-8859-1') $newstring=utf8_encode($string); + if ($conf->file->character_set_client == 'ISO-8859-1') $newstring=utf8_encode($string); else $newstring=$string; // Now newstring is always UTF8 string diff --git a/htdocs/paybox/paybox.lib.php b/htdocs/paybox/paybox.lib.php index cda76524cfc..aef6d361be8 100644 --- a/htdocs/paybox/paybox.lib.php +++ b/htdocs/paybox/paybox.lib.php @@ -32,7 +32,7 @@ function llxHeaderPaybox($title, $head = "") // Si feuille de style en php existe if (file_exists(DOL_DOCUMENT_ROOT.'/'.$conf->css.".php")) $conf->css.=".php"; - header("Content-type: text/html; charset=".$conf->character_set_client); + header("Content-type: text/html; charset=".$conf->file->character_set_client); print ''; //print ''; @@ -156,11 +156,11 @@ function print_paybox_redirect($PRICE,$CURRENCY,$EMAIL,$urlok,$urlko,$TAG) dol_syslog("PBX_SOURCE: $PBX_SOURCE", LOG_DEBUG); dol_syslog("PBX_TYPEPAIEMENT: $PBX_TYPEPAIEMENT", LOG_DEBUG); - header("Content-type: text/html; charset=".$conf->character_set_client); + header("Content-type: text/html; charset=".$conf->file->character_set_client); print ''."\n"; print ''."\n"; - print "\n"; + print "\n"; print ''."\n"; print ''."\n"; print "\n"; diff --git a/htdocs/public/demo/index.php b/htdocs/public/demo/index.php index be1be5d3b6a..a32ae3e5ecb 100644 --- a/htdocs/public/demo/index.php +++ b/htdocs/public/demo/index.php @@ -60,7 +60,7 @@ function llxHeaderVierge($title, $head = "") { global $user, $conf, $langs; - header("Content-type: text/html; charset=".$conf->character_set_client); + header("Content-type: text/html; charset=".$conf->file->character_set_client); print ''; //print ''; @@ -124,7 +124,7 @@ llxHeaderVierge($langs->trans("DolibarrDemo")); // Search modules -$dirlist=$conf->dol_document_root; +$dirlist=$conf->file->dol_document_root; $filename = array(); $modules = array(); diff --git a/htdocs/public/members/public_card.php b/htdocs/public/members/public_card.php index 9e31c34b9ac..5689f241d3e 100644 --- a/htdocs/public/members/public_card.php +++ b/htdocs/public/members/public_card.php @@ -110,7 +110,7 @@ function llxHeaderVierge($title, $head = "") { global $user, $conf, $langs; - header("Content-type: text/html; charset=".$conf->character_set_client); + header("Content-type: text/html; charset=".$conf->file->character_set_client); print "\n"; print "\n"; print "".$title."\n"; diff --git a/htdocs/public/members/public_list.php b/htdocs/public/members/public_list.php index b4fd45fdb4b..d818bf4c7cb 100644 --- a/htdocs/public/members/public_list.php +++ b/htdocs/public/members/public_list.php @@ -37,7 +37,7 @@ function llxHeaderVierge($title, $head = "") { global $user, $conf, $langs; - header("Content-type: text/html; charset=".$conf->character_set_client); + header("Content-type: text/html; charset=".$conf->file->character_set_client); print "\n"; print "\n"; print "".$title."\n"; diff --git a/htdocs/support/inc.php b/htdocs/support/inc.php index 3e6cac5145c..f82cefc98fe 100644 --- a/htdocs/support/inc.php +++ b/htdocs/support/inc.php @@ -109,7 +109,7 @@ if (! defined('DONOTLOADCONF') && file_exists($conffile)) if (! isset($dolibarr_main_db_prefix) || ! $dolibarr_main_db_prefix) $dolibarr_main_db_prefix='llx_'; define('MAIN_DB_PREFIX',(isset($dolibarr_main_db_prefix)?$dolibarr_main_db_prefix:'')); define('DOL_DATA_ROOT',(isset($dolibarr_main_data_root)?$dolibarr_main_data_root:'')); -if (empty($conf->character_set_client)) $conf->character_set_client=$charset; +if (empty($conf->file->character_set_client)) $conf->file->character_set_client=$charset; if (empty($conf->db->dolibarr_main_db_collation)) $conf->db->dolibarr_main_db_collation='latin1_swedish_ci'; if (empty($conf->db->user)) $conf->db->user=''; @@ -172,7 +172,7 @@ function conf($dolibarr_main_document_root) $conf->db->user = trim($dolibarr_main_db_user); $conf->db->pass = trim($dolibarr_main_db_pass); - if (empty($conf->character_set_client)) $conf->character_set_client="UTF-8"; + if (empty($conf->file->character_set_client)) $conf->file->character_set_client="UTF-8"; if (empty($conf->db->dolibarr_main_db_collation)) $conf->db->dolibarr_main_db_collation='latin1_swedish_ci'; return 1; @@ -190,12 +190,12 @@ function pHeader($soutitre,$next,$action='none') $langs->load("admin"); // On force contenu dans format sortie - header("Content-type: text/html; charset=".$conf->character_set_client); + header("Content-type: text/html; charset=".$conf->file->character_set_client); print ''."\n"; print ''."\n"; print ''."\n"; - print ''."\n"; + print ''."\n"; print ''."\n"; print ''.$langs->trans("Help").''."\n"; print ''."\n"; diff --git a/htdocs/user/group/perms.php b/htdocs/user/group/perms.php index 3133a48209f..ea144acda47 100644 --- a/htdocs/user/group/perms.php +++ b/htdocs/user/group/perms.php @@ -81,7 +81,7 @@ if ($_GET["id"]) // Charge les modules soumis a permissions $modules = array(); - foreach ($conf->dol_document_root as $dirroot) + foreach ($conf->file->dol_document_root as $dirroot) { $dir = $dirroot . "/includes/modules/"; diff --git a/htdocs/user/passwordforgotten.php b/htdocs/user/passwordforgotten.php index de88ebf2037..bae58518966 100644 --- a/htdocs/user/passwordforgotten.php +++ b/htdocs/user/passwordforgotten.php @@ -227,7 +227,7 @@ print 'main_authentication) $title.=", ".$langs->trans("AuthenticationMode").': '.$conf->main_authentication; +if ($conf->file->main_authentication) $title.=", ".$langs->trans("AuthenticationMode").': '.$conf->file->main_authentication; // Show logo (search in order: small company logo, large company logo, theme logo, common logo) $width=0; diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php index c86d3e56678..5c28e727ca6 100644 --- a/htdocs/user/perms.php +++ b/htdocs/user/perms.php @@ -103,7 +103,7 @@ $db->begin(); // Charge les modules soumis a permissions $modules = array(); -$listdir=$conf->dol_document_root; +$listdir=$conf->file->dol_document_root; foreach($listdir as $dirroot) { $dir=$dirroot."/includes/modules/";