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

Merge pull request #4256 from GPCsolutions/dolibarr-mysqli

Browse Source 
[Qual] mysqli code review
This commit is contained in:
Laurent Destailleur 2016-01-22 02:22:47 +01:00
commit d7847a8ec8
2 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/admin/tools/export.php
View File

@ -1,6 +1,7 @@
<?php <?php
/* Copyright (C) 2006-2014 Laurent Destailleur <eldy@users.sourceforge.net> /* Copyright (C) 2006-2014 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2011 Juanjo Menent <jmenent@2byte.es> * Copyright (C) 2011 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2015 Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -417,8 +418,14 @@ function backup_tables($outputfile, $tables='*')
global $errormsg; global $errormsg;
// Set to UTF-8 // Set to UTF-8
if(is_a($db, 'DoliDBMysqli')) {
/** @var DoliDBMysqli $db */
$db->db->set_charset('utf8');
} else {
/** @var DoliDB $db */
$db->query('SET NAMES utf8'); $db->query('SET NAMES utf8');
$db->query('SET CHARACTER SET utf8'); $db->query('SET CHARACTER SET utf8');
}
//get all of the tables //get all of the tables
if ($tables == '*') if ($tables == '*')

24
htdocs/core/db/mysqli.class.php
View File

@ -4,6 +4,7 @@
* Copyright (C) 2004-2011 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2011 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2006 Andre Cianfarani <acianfa@free.fr> * Copyright (C) 2006 Andre Cianfarani <acianfa@free.fr>
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com> * Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2015 Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -75,7 +76,6 @@ class DoliDBMysqli extends DoliDB
$this->ok = false; $this->ok = false;
$this->error="Mysqli PHP functions for using Mysqli driver are not available in this version of PHP. Try to use another driver."; $this->error="Mysqli PHP functions for using Mysqli driver are not available in this version of PHP. Try to use another driver.";
dol_syslog(get_class($this)."::DoliDBMysqli : Mysqli PHP functions for using Mysqli driver are not available in this version of PHP. Try to use another driver.",LOG_ERR); dol_syslog(get_class($this)."::DoliDBMysqli : Mysqli PHP functions for using Mysqli driver are not available in this version of PHP. Try to use another driver.",LOG_ERR);
return $this->ok;
} }
if (! $host) if (! $host)
@ -84,7 +84,6 @@ class DoliDBMysqli extends DoliDB
$this->ok = false; $this->ok = false;
$this->error=$langs->trans("ErrorWrongHostParameter"); $this->error=$langs->trans("ErrorWrongHostParameter");
dol_syslog(get_class($this)."::DoliDBMysqli : Connect error, wrong host parameters",LOG_ERR); dol_syslog(get_class($this)."::DoliDBMysqli : Connect error, wrong host parameters",LOG_ERR);
return $this->ok;
} }
// Try server connection // Try server connection
@ -96,7 +95,6 @@ class DoliDBMysqli extends DoliDB
$this->ok = false; $this->ok = false;
$this->error = $this->db->connect_error; $this->error = $this->db->connect_error;
dol_syslog(get_class($this) . "::DoliDBMysqli Connect error: " . $this->error, LOG_ERR); dol_syslog(get_class($this) . "::DoliDBMysqli Connect error: " . $this->error, LOG_ERR);
return $this->ok;
} else { } else {
$this->connected = true; $this->connected = true;
$this->ok = true; $this->ok = true;
@ -115,10 +113,8 @@ class DoliDBMysqli extends DoliDB
$clientmustbe=''; $clientmustbe='';
if (preg_match('/UTF-8/i',$conf->file->character_set_client)) $clientmustbe='utf8'; if (preg_match('/UTF-8/i',$conf->file->character_set_client)) $clientmustbe='utf8';
if (preg_match('/ISO-8859-1/i',$conf->file->character_set_client)) $clientmustbe='latin1'; if (preg_match('/ISO-8859-1/i',$conf->file->character_set_client)) $clientmustbe='latin1';
if ($this->db->character_set_name() != $clientmustbe) if ($this->db->character_set_name() != $clientmustbe) {
{ $this->db->set_charset($clientmustbe);
$this->query("SET NAMES '".$clientmustbe."'", $this->db);
//$this->query("SET CHARACTER SET ". $this->forcecharset);
} }
} }
else else
@ -141,15 +137,11 @@ class DoliDBMysqli extends DoliDB
$clientmustbe=''; $clientmustbe='';
if (preg_match('/UTF-8/i',$conf->file->character_set_client)) $clientmustbe='utf8'; if (preg_match('/UTF-8/i',$conf->file->character_set_client)) $clientmustbe='utf8';
if (preg_match('/ISO-8859-1/i',$conf->file->character_set_client)) $clientmustbe='latin1'; if (preg_match('/ISO-8859-1/i',$conf->file->character_set_client)) $clientmustbe='latin1';
if ($this->db->character_set_name() != $clientmustbe) if ($this->db->character_set_name() != $clientmustbe) {
{ $this->db->set_charset($clientmustbe);
$this->query("SET NAMES '".$clientmustbe."'", $this->db);
//$this->query("SET CHARACTER SET ". $this->forcecharset);
} }
} }
} }
return $this->ok;
} }
@ -203,7 +195,7 @@ class DoliDBMysqli extends DoliDB
*/ */
function getVersion() function getVersion()
{ {
return $this->db->get_server_info(); return $this->db->server_info;
} }
/** /**
@ -213,7 +205,7 @@ class DoliDBMysqli extends DoliDB
*/ */
function getDriverInfo() function getDriverInfo()
{ {
return $this->db->get_client_info(); return $this->db->client_info;
} }
@ -381,7 +373,7 @@ class DoliDBMysqli extends DoliDB
*/ */
function escape($stringtoencode) function escape($stringtoencode)
{ {
return addslashes($stringtoencode); return $this->db->real_escape_string($stringtoencode);
} }
/** /**