From dad0dff3fbfa078899ac2b17d10fe599824e16b7 Mon Sep 17 00:00:00 2001 From: Rodolphe Quiedeville Date: Tue, 26 Aug 2003 10:16:57 +0000 Subject: [PATCH] Nettoyage du code --- htdocs/compta/resultat/caisse.php | 2 -- htdocs/compta/resultat/index.php | 1 - htdocs/compta/stats/casoc.php | 2 -- htdocs/compta/stats/comp.php | 1 - htdocs/compta/stats/cumul.php | 2 -- htdocs/compta/stats/exercices.php | 2 -- htdocs/compta/stats/index.php | 2 -- htdocs/compta/stats/prev.php | 2 +- htdocs/compta/tva/index.php | 2 -- htdocs/compta/tva/reglement.php | 2 -- htdocs/contact.php | 2 +- htdocs/install.php | 2 +- htdocs/main.inc.php3 | 2 +- 13 files changed, 4 insertions(+), 20 deletions(-) diff --git a/htdocs/compta/resultat/caisse.php b/htdocs/compta/resultat/caisse.php index ac2e70dd04c..0d775fd5084 100644 --- a/htdocs/compta/resultat/caisse.php +++ b/htdocs/compta/resultat/caisse.php @@ -25,8 +25,6 @@ require("./pre.inc.php3"); * */ -$db = new Db(); - llxHeader(); /* diff --git a/htdocs/compta/resultat/index.php b/htdocs/compta/resultat/index.php index 8eb9a216e23..c527b0f98ed 100644 --- a/htdocs/compta/resultat/index.php +++ b/htdocs/compta/resultat/index.php @@ -33,7 +33,6 @@ td.border { border: 1px solid #000000} societe_id > 0) */ llxHeader(); -$db = new Db(); - print_titre("Chiffre d'affaire par société"); /* diff --git a/htdocs/compta/stats/comp.php b/htdocs/compta/stats/comp.php index ef516364edb..9c3fb7d861f 100644 --- a/htdocs/compta/stats/comp.php +++ b/htdocs/compta/stats/comp.php @@ -307,7 +307,6 @@ if ($user->societe_id > 0) $socidp = $user->societe_id; } -$db = new Db(); $cyear = strftime ("%Y", time()); diff --git a/htdocs/compta/stats/cumul.php b/htdocs/compta/stats/cumul.php index 268ca47f90d..9749b17178b 100644 --- a/htdocs/compta/stats/cumul.php +++ b/htdocs/compta/stats/cumul.php @@ -25,8 +25,6 @@ require("./pre.inc.php"); * */ -$db = new Db(); - llxHeader(); /* diff --git a/htdocs/compta/stats/exercices.php b/htdocs/compta/stats/exercices.php index 23e129ce629..9239b75eeee 100644 --- a/htdocs/compta/stats/exercices.php +++ b/htdocs/compta/stats/exercices.php @@ -294,8 +294,6 @@ function ppt ($db, $year, $socidp) llxHeader(); -$db = new Db(); - /* * Sécurité accés client */ diff --git a/htdocs/compta/stats/index.php b/htdocs/compta/stats/index.php index 554c5ae34e7..1de934c6260 100644 --- a/htdocs/compta/stats/index.php +++ b/htdocs/compta/stats/index.php @@ -25,8 +25,6 @@ require("./pre.inc.php"); * */ -$db = new Db(); - llxHeader(); /* diff --git a/htdocs/compta/stats/prev.php b/htdocs/compta/stats/prev.php index 9faeb0d50fe..840c14ce858 100644 --- a/htdocs/compta/stats/prev.php +++ b/htdocs/compta/stats/prev.php @@ -76,7 +76,7 @@ function pt ($db, $sql, $title) { llxHeader(); -$db = new Db(); + if ($sortfield == "") { $sortfield="lower(p.label)"; diff --git a/htdocs/compta/tva/index.php b/htdocs/compta/tva/index.php index 7dab5d30c05..415ed0c87ce 100644 --- a/htdocs/compta/tva/index.php +++ b/htdocs/compta/tva/index.php @@ -99,8 +99,6 @@ function pt ($db, $sql, $date) { llxHeader(); -$db = new Db(); - $tva = new Tva($db); print_titre( "TVA Solde : " . price($tva->solde($year)) . " euros"); diff --git a/htdocs/compta/tva/reglement.php b/htdocs/compta/tva/reglement.php index 0b6d02ff5e2..58e41ea5a61 100644 --- a/htdocs/compta/tva/reglement.php +++ b/htdocs/compta/tva/reglement.php @@ -28,8 +28,6 @@ require("../../tva.class.php3"); llxHeader(); -$db = new Db(); - $tva = new Tva($db); print_titre("Réglements TVA"); diff --git a/htdocs/contact.php b/htdocs/contact.php index 859e0bef310..580d4f79d16 100644 --- a/htdocs/contact.php +++ b/htdocs/contact.php @@ -32,7 +32,7 @@ if ($user->societe_id > 0) } llxHeader(); -$db = new Db(); + if ($sortorder == "") { diff --git a/htdocs/install.php b/htdocs/install.php index 4e14e5b4472..2e490ba201c 100644 --- a/htdocs/install.php +++ b/htdocs/install.php @@ -110,7 +110,7 @@ if ($HTTP_POST_VARS["action"] == "set") $conf->db->name = $dolibarr_main_db_name; $conf->db->user = $dolibarr_main_db_user; $conf->db->pass = $dolibarr_main_db_pass; - $db = new Db(); + $db = new DoliDb(); $sql[0] = "REPLACE INTO llx_const SET name = 'FAC_OUTPUTDIR', value='".$dolibarr_main_document_root."/document/facture', visible=0, type='chaine'"; diff --git a/htdocs/main.inc.php3 b/htdocs/main.inc.php3 index a94e632ed8f..e9ba9bdc691 100644 --- a/htdocs/main.inc.php3 +++ b/htdocs/main.inc.php3 @@ -70,7 +70,7 @@ require (DOL_DOCUMENT_ROOT ."/includes/fpdf/fpdf.php"); define('FPDF_FONTPATH',DOL_DOCUMENT_ROOT .'/includes/fpdf/font/'); -$db = new Db(); +$db = new DoliDb(); $user = new User($db);