diff --git a/htdocs/install/etape1.php b/htdocs/install/etape1.php index e067475606f..0ee9b318c14 100644 --- a/htdocs/install/etape1.php +++ b/htdocs/install/etape1.php @@ -30,7 +30,7 @@ define('DONOTLOADCONF',1); // To avoid loading conf by file inc..php -include_once("./inc.php"); +include("./inc.php"); $setuplang=isset($_POST["selectlang"])?$_POST["selectlang"]:(isset($_GET["selectlang"])?$_GET["selectlang"]:'auto'); $langs->setDefaultLang($setuplang); diff --git a/htdocs/install/etape2.php b/htdocs/install/etape2.php index 5a036bff7d2..3295cb974f4 100644 --- a/htdocs/install/etape2.php +++ b/htdocs/install/etape2.php @@ -26,7 +26,7 @@ \version $Revision$ */ -include_once("./inc.php"); +include("./inc.php"); if (! isset($dolibarr_main_db_prefix) || ! $dolibarr_main_db_prefix) $dolibarr_main_db_prefix='llx_'; define('MAIN_DB_PREFIX',$dolibarr_main_db_prefix); require_once($dolibarr_main_document_root . "/lib/databases/".$dolibarr_main_db_type.".lib.php"); @@ -66,13 +66,6 @@ if ($_POST["action"] == "set") print ''; $error=0; - $conf = new Conf();// on pourrait s'en passer - $conf->db->type = $dolibarr_main_db_type; - $conf->db->host = $dolibarr_main_db_host; - $conf->db->name = $dolibarr_main_db_name; - $conf->db->user = $dolibarr_main_db_user; - $conf->db->pass = $dolibarr_main_db_pass; - $db = new DoliDb($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name); if ($db->connected == 1) { @@ -149,7 +142,7 @@ if ($_POST["action"] == "set") $requestnb++; if ($db->query($buffer)) { - //print ""; + // print ""; } else { @@ -385,7 +378,7 @@ if ($_POST["action"] == "set") while (!feof ($fp)) { $buffer = fgets($fp, 4096); - + print "
OK requete ==== $buffer
OK requete ==== $buffer
Insertion ligne : $buffer"; if (strlen(trim(ereg_replace("--","",$buffer)))) { if ($db->query($buffer)) @@ -396,7 +389,7 @@ if ($_POST["action"] == "set") { if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') { - // print "
Insertion ligne : $buffer + //print "
Insertion ligne : $buffer"; } else { diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php index f18f4751182..e713a18b70c 100644 --- a/htdocs/install/inc.php +++ b/htdocs/install/inc.php @@ -44,7 +44,6 @@ if (file_exists($conffile)) { include_once($conffile); // Fichier conf chargé - $charset=$character_set_client; // Remove last / or \ on directories or url value if (! ereg('^[\\\/]+$',$dolibarr_main_document_root)) $dolibarr_main_document_root=ereg_replace('[\\\/]+$','',$dolibarr_main_document_root); if (! ereg('^[\\\/]+$',$dolibarr_main_url_root)) $dolibarr_main_url_root=ereg_replace('[\\\/]+$','',$dolibarr_main_url_root); @@ -54,7 +53,6 @@ if (file_exists($conffile)) { require_once($dolibarr_main_document_root . "/conf/conf.class.php"); $conf=new Conf(); - $conf = new Conf(); $conf->db->type = trim($dolibarr_main_db_type); $conf->db->host = trim($dolibarr_main_db_host); $conf->db->name = trim($dolibarr_main_db_name); @@ -66,6 +64,7 @@ if (file_exists($conffile)) $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; + } if ($dolibarr_main_document_root && $dolibarr_main_db_type && ! defined('DONOTLOADCONF')) { diff --git a/htdocs/lib/databases/mysql.lib.php b/htdocs/lib/databases/mysql.lib.php index d674bf55980..b01a908082a 100644 --- a/htdocs/lib/databases/mysql.lib.php +++ b/htdocs/lib/databases/mysql.lib.php @@ -165,6 +165,7 @@ class DoliDb if (mysql_client_encoding ( $this->db ) != $this->forcecharset) { $this->query("SET NAMES '".$this->forcecharset."'", $this->db); + $this->query("SET CHARACTER SET ". $this->forcecharset); } $this->connected = 1; $this->ok = 1; @@ -232,7 +233,8 @@ class DoliDb //force les enregistrement en latin1 si la base est en utf8 par défaut // Supprimé car plante sur mon PHP-Mysql. De plus, la base est forcement en latin1 avec // les nouvelles version de Dolibarr car forcé par l'install Dolibarr. - //$this->query('SET NAMES '.$this->forcecharset); + $this->query("SET NAMES '".$this->forcecharset."'", $this->db); + $this->query("SET CHARACTER SET '".$this->forcecharset."'", $this->db); //print "Resultat fonction connect: ".$this->db; return $this->db; } diff --git a/htdocs/lib/databases/mysqli.lib.php b/htdocs/lib/databases/mysqli.lib.php index 1f6792071cd..42317e16306 100644 --- a/htdocs/lib/databases/mysqli.lib.php +++ b/htdocs/lib/databases/mysqli.lib.php @@ -163,10 +163,11 @@ class DoliDb if ($this->db) { // Si client connecté avec charset different de celui de Dolibarr - if (mysqli_client_encoding ( $this->db ) != $this->forcecharset) + /*if (mysqli_client_encoding ( $this->db ) != $this->forcecharset) { $this->query("SET NAMES '".$this->forcecharset."'", $this->db); - } + $this->query("SET CHARACTER SET '".$this->forcecharset."'", $this->db); + }*/ $this->connected = 1; $this->ok = 1; } @@ -236,10 +237,11 @@ class DoliDb // les nouvelles version de Dolibarr car forcé par l'install Dolibarr. //$this->query('SET NAMES '.$this->forcecharset); //print "Resultat fonction connect: ".$this->db; + $this->query("SET NAMES '".$this->forcecharset."'", $this->db); + $this->query("SET CHARACTER SET '".$this->forcecharset."'", $this->db); return $this->db; } - /** \brief Renvoie la version du serveur \return string Chaine version @@ -355,10 +357,9 @@ class DoliDb function query($query) { $query = trim($query); - if (! $this->database_name) { - // Ordre SQL ne nécessitant pas de connexion à une base (exemple: CREATE DATABASE) + // Ordre SQL ne nécessitant pas de connexion à une base (exemple: CREATE DATABASE $ret = mysqli_query($this->db,$query); } else @@ -697,7 +698,7 @@ class DoliDb $like = ''; if ($table) $like = "LIKE '".$table."'"; $sql="SHOW TABLES FROM ".$database." ".$like.";"; - //print $sql; + // $sql; $result = $this->query($sql); while($row = $this->fetch_row($result)) {