Skip to content
Snippets Groups Projects
Commit 0456b84f authored by Rodolphe Quiedeville's avatar Rodolphe Quiedeville
Browse files

Nettoyage

parent e26168fd
No related branches found
No related tags found
No related merge requests found
<?php
/* Copyright (C) 2001 Fabien Seisen <seisen@linuxfr.org>
* Copyright (C) 2002-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2002-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2006 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2006 Andre Cianfarani <acianfa@free.fr>
*
......@@ -34,27 +34,39 @@
/**
\class DoliDb
\brief Classe permettant de grr la database de dolibarr
\brief Classe de gestion de la database de dolibarr
*/
class DoliDb
{
var $db; // Handler de base
var $type='mysql'; // Nom du gestionnaire
//! Handler de base
var $db;
//! Nom du gestionnaire
var $type='mysql';
//! Charset
var $forcecharset='latin1';
//! Collate
var $forcecollate='latin1_swedish_ci';
var $versionmin=array(3,1,0); // Version min database
var $results; // Resultset de la dernire requete
var $connected; // 1 si connect, 0 sinon
var $database_selected; // 1 si base slectionn, 0 sinon
var $database_name; // Nom base slectionne
var $transaction_opened; // 1 si une transaction est en cours, 0 sinon
var $lastquery; // Derniere requete excute
var $lastqueryerror; // Derniere requete excute avec echec
var $lasterror; // Message erreur mysql
var $lasterrno; // Message erreur mysql
//! Version min database
var $versionmin=array(3,1,0);
//! Resultset de la dernire requete
var $results;
//! 1 si connect, 0 sinon
var $connected;
//! 1 si base slectionn, 0 sinon
var $database_selected;
//! Nom base slectionne
var $database_name;
//! 1 si une transaction est en cours, 0 sinon
var $transaction_opened;
//! Derniere requete excute
var $lastquery;
//! Derniere requete excute avec echec
var $lastqueryerror;
//! Message erreur mysql
var $lasterror;
//! Message erreur mysql
var $lasterrno;
var $ok;
var $error;
......@@ -103,8 +115,6 @@ class DoliDb
global $conf,$langs;
$this->transaction_opened=0;
//print "Name DB: $host,$user,$pass,$name<br>";
if (! function_exists("mysql_connect"))
{
$this->connected = 0;
......@@ -182,7 +192,6 @@ class DoliDb
return mysql_select_db($database, $this->db);
}
/**
\brief Connection vers le serveur
\param host addresse de la base de donnes
......@@ -196,20 +205,15 @@ class DoliDb
{
dolibarr_syslog("DoliDB::connect host=$host, login=$login, passwd=$passwd, name=$name");
$this->db = @mysql_connect($host, $login, $passwd);
//print "Resultat fonction connect: ".$this->db." - mysql_error=".mysql_error();
return $this->db;
}
/**
\brief Renvoie la version du serveur
\return string Chaine version
*/
function getVersion()
{
// $resql=$this->query('SELECT VERSION()');
// $row=$this->fetch_row($resql);
// return $row[0];
return mysql_get_server_info($this->db);
}
......@@ -224,7 +228,6 @@ class DoliDb
}
/**
\brief Fermeture d'une connection vers une database.
\return resource
......@@ -280,10 +283,13 @@ class DoliDb
*/
function rollback()
{
dolibarr_syslog("ROLLBACK ".$this->transaction_opened, LOG_ERR);
if ($this->transaction_opened<=1)
{
$ret=$this->query("ROLLBACK");
$this->transaction_opened=0;
return $ret;
}
else
......@@ -597,7 +603,6 @@ class DoliDb
$ret=$this->query($sql);
}
//print "database=".$this->database_name." ret=".$ret." mysqlerror=".mysql_error($this->db);
return $ret;
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment