lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: Pas de plantage si echec inclusion.

Browse Source
This commit is contained in:
Laurent Destailleur 2007-12-11 00:00:00 +00:00
parent 642a68250f
commit 6ae407113d
1 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
htdocs/install/inc.php
View File

@ -104,30 +104,36 @@ $bc[true]=' class="bg2"';
/* /*
* \brief Charge fichier conf (doit exister) * \brief Load conf file (file must exists)
* \param dolibarr_main_document_root Root directory of Dolibarr bin files
* \return int <0 if KO, >0 if OK
*/ */
function conf($dolibarr_main_document_root) function conf($dolibarr_main_document_root)
{ {
require_once($dolibarr_main_document_root."/conf/conf.class.php"); global $conf;
global $conf; global $dolibarr_main_db_type;
global $dolibarr_main_db_type; global $dolibarr_main_db_host;
global $dolibarr_main_db_host; global $dolibarr_main_db_name;
global $dolibarr_main_db_name; global $dolibarr_main_db_user;
global $dolibarr_main_db_user; global $dolibarr_main_db_pass;
global $dolibarr_main_db_pass;
$conf=new Conf(); $return=include_once($dolibarr_main_document_root."/conf/conf.class.php");
$conf->db->type = trim($dolibarr_main_db_type); if (! $return) return -1;
$conf->db->host = trim($dolibarr_main_db_host);
$conf->db->name = trim($dolibarr_main_db_name); $conf=new Conf();
$conf->db->user = trim($dolibarr_main_db_user); $conf->db->type = trim($dolibarr_main_db_type);
$conf->db->pass = trim($dolibarr_main_db_pass); $conf->db->host = trim($dolibarr_main_db_host);
if (! isset($character_set_client) || ! $character_set_client) $character_set_client='ISO-8859-1'; $conf->db->name = trim($dolibarr_main_db_name);
$conf->character_set_client=$character_set_client; $conf->db->user = trim($dolibarr_main_db_user);
if (! isset($dolibarr_main_db_charset) || ! $dolibarr_main_db_charset) $dolibarr_main_db_charset='latin1'; $conf->db->pass = trim($dolibarr_main_db_pass);
$conf->db->character_set=$dolibarr_main_db_charset; if (! isset($character_set_client) || ! $character_set_client) $character_set_client='ISO-8859-1';
if (! isset($collation_connection) || ! $collation_connection) $collation_connection='latin1_swedish_ci'; $conf->character_set_client=$character_set_client;
$conf->db->collation_connection=$collation_connection; if (! isset($dolibarr_main_db_charset) || ! $dolibarr_main_db_charset) $dolibarr_main_db_charset='latin1';
$conf->db->character_set=$dolibarr_main_db_charset;
if (! isset($collation_connection) || ! $collation_connection) $collation_connection='latin1_swedish_ci';
$conf->db->collation_connection=$collation_connection;
return 1;
} }