From 59810aa123baead4aa8b2192f38c7a3fb6ec5445 Mon Sep 17 00:00:00 2001
From: x2000habouzit <x2000habouzit>
Date: Fri, 20 Feb 2004 09:54:43 +0000
Subject: [PATCH] on utilise plus mysql_query

---
 etat_migration                          |   2 +-
 htdocs/acces_smtp.php                   |   8 +-
 htdocs/acces_wap.php                    |   8 +-
 htdocs/admin/deces_promo.php            |   4 +-
 htdocs/admin/newsletter_archi.php       |   8 +-
 htdocs/admin/newsletter_pattecassee.php |   8 +-
 htdocs/alias.php                        |   4 +-
 htdocs/antispam.php                     |  12 +--
 htdocs/auth-groupex.php                 |   4 +-
 htdocs/carva_redirect.php               |   6 +-
 htdocs/cookie_on.php                    |   2 +-
 htdocs/emails.php                       |   4 +-
 htdocs/epouse.php                       |   2 +-
 htdocs/exit.php                         |   2 +-
 htdocs/getphoto.php                     |   2 +-
 htdocs/groupex/export-econfiance.php    |   2 +-
 htdocs/login.php                        |   8 +-
 htdocs/mescontacts.php                  |  10 +-
 htdocs/mescontacts_ldif.php             |   4 +-
 htdocs/motdepassemd5.php                |   2 +-
 htdocs/newsletter.php                   |   4 +-
 htdocs/pattecassee.php                  |   6 +-
 htdocs/redirect/redirect.php            |   2 +-
 htdocs/skins.php                        |   2 +-
 htdocs/stats/coupure.php                |   2 +-
 htdocs/stats/graph_promo.php            |   2 +-
 htdocs/stats/nb_by_promo.php            |   2 +-
 htdocs/trezo/gere_operations.php        |   4 +-
 htdocs/vcard.php                        |   6 +-
 include/applis.func.inc.php             |   2 +-
 include/domaine.inc.php                 |   8 +-
 include/sondage.requetes.inc.php        | 182 ++++++++++++++++----------------
 include/trezo.inc.php                   |   2 +-
 include/valid_aliases.inc.php           |   6 +-
 include/valid_epouses.inc.php           |   4 +-
 include/valid_evts.inc.php              |   8 +-
 include/valid_ml.inc.php                |  22 ++--
 include/valid_photos.inc.php            |   4 +-
 include/valid_sondages.inc.php          |   6 +-
 include/validations.inc.php             |  20 ++--
 include/xorg.misc.inc.php               |   6 +-
 include/xorg.page.inc.php               |   3 +-
 include/xorg.session.inc.php            |  14 +--
 43 files changed, 210 insertions(+), 209 deletions(-)

diff --git a/etat_migration b/etat_migration
index 7b337b2..941b34f 100644
--- a/etat_migration
+++ b/etat_migration
@@ -65,7 +65,6 @@ Etat  | Ancien nom								  | Nouveau nom
 ;	  | pg.confirm.php							  | 
 ;	  | pg.php									  | 
 ;	  | profil.php								  | 
-;	  | profil2.php								  | 
 ;	  | recherche.php							  | 
 ;	  | trombino.php							  | 
 ;	  | trombipromo.php							  | 
@@ -199,6 +198,7 @@ x!!	  | admin/newsletter_form.inc.php			  | -
 x!!	  | admin/statut_antispam.php				  | inutilisée et même pas en var superglobales ...
 x!!	  | aide.php								  | --> faq.php
 x!!	  | auth-wiki.php							  | obsolete
+x!!	  | profil2.php								  | -
 x!!	  | trackers/tracker_delete.php				  | -
 x!!	  | trezo/trezo.inc.php						  | -
 ------+-------------------------------------------+----------------
diff --git a/htdocs/acces_smtp.php b/htdocs/acces_smtp.php
index b420f80..ecebb1c 100644
--- a/htdocs/acces_smtp.php
+++ b/htdocs/acces_smtp.php
@@ -8,23 +8,23 @@ if (isset($_REQUEST['op']) && $_REQUEST['op'] == "Valider"
         && strlen($_REQUEST['smtppass1'])>=6) {
 
     // on change le mot de passe
-    $result = mysql_query("select smtppass from auth_user_md5 where user_id = ".$_SESSION['uid']);
+    $result = $globals->db->query("select smtppass from auth_user_md5 where user_id = ".$_SESSION['uid']);
     list($smtppass_old) = mysql_fetch_row($result);
     mysql_free_result($result);
-    mysql_query("update auth_user_md5 set smtppass = '{$_REQUEST['smtppass1']}' where user_id = ".$_SESSION['uid']);
+    $globals->db->query("update auth_user_md5 set smtppass = '{$_REQUEST['smtppass1']}' where user_id = ".$_SESSION['uid']);
     $_SESSION['log']->log("passwd_ssl");
 
     $page->assign('message','Mot de passe enregistré');
 
 } elseif (isset($_REQUEST['op']) && $_REQUEST['op'] == "Supprimer") {
 
-    mysql_query("update auth_user_md5 set smtppass = '' where user_id = ".$_SESSION['uid']);
+    $globals->db->query("update auth_user_md5 set smtppass = '' where user_id = ".$_SESSION['uid']);
     $_SESSION['log']->log("passwd_del");
     $page->assign('message','Compte SMTP et NNTP supprimé');
 
 }
 
-$result = mysql_query("select smtppass from auth_user_md5 where user_id = ".$_SESSION['uid']);
+$result = $globals->db->query("select smtppass from auth_user_md5 where user_id = ".$_SESSION['uid']);
 list($smtppass_old) = mysql_fetch_row($result);
 mysql_free_result($result);
 
diff --git a/htdocs/acces_wap.php b/htdocs/acces_wap.php
index 8c84adf..421378a 100644
--- a/htdocs/acces_wap.php
+++ b/htdocs/acces_wap.php
@@ -19,7 +19,7 @@ if (isset($_REQUEST['op']) && $_REQUEST['op'] == "valid") {
     if (isset($_REQUEST['IMAPport'])&&is_integer($_REQUEST['IMAPport'])) $sql.=",IMAPport = {$_REQUEST['IMAPport']}";
     if (isset($_REQUEST['IMAPdir'])) $sql.=",IMAPdir = '".addslashes($_REQUEST['IMAPdir'])."'";
     $sql.=" where uid = ".$_SESSION['uid'];
-    mysql_query($sql);
+    $globals->db->query($sql);
 
     $page->assign('OK',true);
     $page->run('OK');
@@ -31,12 +31,12 @@ if (isset($_REQUEST['op']) && $_REQUEST['op'] == "valid") {
                     IMAPserver,IMAPport,IMAPdir,
                     FIND_IN_SET('IMAPssl',flags) AS IMAPssl
                     FROM wap WHERE uid = ".$_SESSION['uid'];
-    $result = mysql_query($sql);
+    $result = $globals->db->query($sql);
 
     if (mysql_num_rows($result)==0) {
         //l'utilisateur n'a pas de profil WAP => on le crée
-        mysql_query("INSERT INTO wap (uid) VALUES (".$_SESSION['uid'].")");
-        $result = mysql_query($sql);
+        $globals->db->query("INSERT INTO wap (uid) VALUES (".$_SESSION['uid'].")");
+        $result = $globals->db->query($sql);
     }
 
     $page->assign('wap', mysql_fetch_assoc($result));
diff --git a/htdocs/admin/deces_promo.php b/htdocs/admin/deces_promo.php
index 9dae21e..db2b90a 100644
--- a/htdocs/admin/deces_promo.php
+++ b/htdocs/admin/deces_promo.php
@@ -11,9 +11,9 @@ if(isset($_REQUEST['add10']))   $promo += 10;
 $page->assign('promo',$promo);
 
 if (isset($_REQUEST["valider"]) && $_REQUEST["valider"] == "Valider") {
-    $res = mysql_query("SELECT matricule FROM identification WHERE promo = $promo");
+    $res = $globals->db->query("SELECT matricule FROM identification WHERE promo = $promo");
     while (list($mat) = mysql_fetch_row($res)) {
-        mysql_query("UPDATE identification SET deces='".$_REQUEST[$mat]."' WHERE matricule = '".$mat."'");
+        $globals->db->query("UPDATE identification SET deces='".$_REQUEST[$mat]."' WHERE matricule = '".$mat."'");
     }
 }
 
diff --git a/htdocs/admin/newsletter_archi.php b/htdocs/admin/newsletter_archi.php
index 6c78f78..e31bebc 100644
--- a/htdocs/admin/newsletter_archi.php
+++ b/htdocs/admin/newsletter_archi.php
@@ -7,20 +7,20 @@ if (!isset($_REQUEST['action'])) $_REQUEST['action'] = "";
 switch ($_REQUEST['action']) {
     case "update":
         if (empty($_REQUEST['nl_id'])) {
-            mysql_query("insert into newsletter set date='{$_REQUEST['nl_date']}', "
+            $globals->db->query("insert into newsletter set date='{$_REQUEST['nl_date']}', "
                     ."titre='{$_REQUEST['nl_titre']}', text='{$_REQUEST['nl_text']}'");
         } else {
-            mysql_query("update newsletter set date='{$_REQUEST['nl_date']}', "
+            $globals->db->query("update newsletter set date='{$_REQUEST['nl_date']}', "
                     ."titre='{$_REQUEST['nl_titre']}', text='{$_REQUEST['nl_text']}' where id='{$_REQUEST['nl_id']}'");
         }
     break;
 
     case "edit":
-        $res = mysql_query("select id, date, titre, text from newsletter where id='{$_REQUEST['nl_id']}'");
+        $res = $globals->db->query("select id, date, titre, text from newsletter where id='{$_REQUEST['nl_id']}'");
         $page->assign('nl', mysql_fetch_assoc($res));
     break;
     case "delete":
-        mysql_query("delete from newsletter where id='{$_REQUEST['nl_id']}'");
+        $globals->db->query("delete from newsletter where id='{$_REQUEST['nl_id']}'");
 }
 
 $sql = "SELECT id,date,titre FROM newsletter ORDER BY date DESC";
diff --git a/htdocs/admin/newsletter_pattecassee.php b/htdocs/admin/newsletter_pattecassee.php
index 5c60528..7d89b1b 100644
--- a/htdocs/admin/newsletter_pattecassee.php
+++ b/htdocs/admin/newsletter_pattecassee.php
@@ -19,7 +19,7 @@ require("tpl.mailer.inc.php");
 if (array_key_exists('email', $_GET) && array_key_exists('action', $_GET)) {
     $email = valide_email($_GET['email']);
     // vérifications d'usage
-    $sel = mysql_query(
+    $sel = $globals->db->query(
       "SELECT a.username
        FROM emails AS e
        INNER JOIN auth_user_md5 AS a ON e.uid = a.user_id
@@ -35,7 +35,7 @@ if (array_key_exists('email', $_GET) && array_key_exists('action', $_GET)) {
     }
 } else if (array_key_exists('email', $_POST)) {
     $email = valide_email($_POST['email']);
-    $sel = mysql_query(
+    $sel = $globals->db->query(
       "SELECT e.uid, e.panne, a.nom, a.prenom, a.promo, a.username
        FROM emails AS e
        INNER JOIN auth_user_md5 AS a ON e.uid = a.user_id
@@ -43,9 +43,9 @@ if (array_key_exists('email', $_GET) && array_key_exists('action', $_GET)) {
     if (list($puid, $ppanne, $pnom, $pprenom, $ppromo, $pusername) = mysql_fetch_row($sel)) {
         // on écrit dans la base que l'adresse est cassée
         if ($ppanne == '0000-00-00')
-            mysql_query("UPDATE emails SET panne='".date("Y-m-d")."' WHERE email =  '$email'");
+            $globals->db->query("UPDATE emails SET panne='".date("Y-m-d")."' WHERE email =  '$email'");
         // on regarde s'il y a d'autres redirections actives
-        $sel = mysql_query("SELECT * FROM emails WHERE uid = " . $puid . " AND FIND_IN_SET('active', flags) AND email != '$email'");
+        $sel = $globals->db->query("SELECT * FROM emails WHERE uid = " . $puid . " AND FIND_IN_SET('active', flags) AND email != '$email'");
         $nb_emails = mysql_num_rows($sel);
         $page->assign('nb_emails', $nb_emails);
         $page->assign('username', $pusername);
diff --git a/htdocs/alias.php b/htdocs/alias.php
index 4c966ac..e1f1040 100644
--- a/htdocs/alias.php
+++ b/htdocs/alias.php
@@ -8,7 +8,7 @@ $page->assign('demande', AliasReq::get_unique_request($_SESSION['uid']));
 
 //Récupération des alias éventuellement existants
 $sql = "SELECT domain from groupex.aliases WHERE id=12 AND email like '".$_SESSION['username']."'";
-if($result = mysql_query($sql)) {
+if($result = $globals->db->query($sql)) {
     list($aliases) = mysql_fetch_row($result);
     mysql_free_result($result);
     $page->assign('actuel',$aliases);
@@ -31,7 +31,7 @@ if (isset($_REQUEST['alias']) and isset($_REQUEST['raison'])) {
         $page->run('error');
     } else {
         //vérifier que l'alias n'est pas déja pris
-        $result = mysql_query("SELECT 1 FROM groupex.aliases WHERE id=12 AND domain LIKE '$alias@melix.net'");
+        $result = $globals->db->query("SELECT 1 FROM groupex.aliases WHERE id=12 AND domain LIKE '$alias@melix.net'");
         if (mysql_num_rows($result)>0) {
             $page->assign('error', "L'alias $alias@melix.net a déja été attribué.
                                     Tu ne peux donc pas l'obtenir.");
diff --git a/htdocs/antispam.php b/htdocs/antispam.php
index 54aed84..0b59ca0 100644
--- a/htdocs/antispam.php
+++ b/htdocs/antispam.php
@@ -7,35 +7,35 @@ require("mtic.inc.php");
 if (isset($_REQUEST['filtre']) and isset($_REQUEST['statut_filtre'])
         and !$no_update_bd) {
     // mise à jour du filtre
-    $result = mysql_query("select find_in_set('drop', flags) from emails where uid = {$_SESSION['uid']} and num = 0 and find_in_set('active', flags)");
+    $result = $globals->db->query("select find_in_set('drop', flags) from emails where uid = {$_SESSION['uid']} and num = 0 and find_in_set('active', flags)");
     list($filtre) = mysql_fetch_row($result);
     mysql_free_result($result);
     $new_filtre = (integer)$_REQUEST['statut_filtre'];
     if ($new_filtre == 0 and isset($filtre)) {
         // désactive le filtre
         // échange les flags active et filtre d'un seul coup (de manière atomique)
-        mysql_query("UPDATE emails SET flags=IF(num=0, REPLACE(flags,'active','filtre'), REPLACE(flags,'filtre','active'))
+        $globals->db->query("UPDATE emails SET flags=IF(num=0, REPLACE(flags,'active','filtre'), REPLACE(flags,'filtre','active'))
                      WHERE uid={$_SESSION['uid']} AND (find_in_set('active',flags) OR FIND_IN_SET('filtre',flags))");
         // supprime la ligne num=0
-        mysql_query("delete from emails where uid={$_SESSION['uid']} and num = 0");
+        $globals->db->query("delete from emails where uid={$_SESSION['uid']} and num = 0");
     } elseif ($new_filtre != 0) {
         // active le filtre
         // ajoute la ligne num=0 avec le bon pipe et un flag filtre et pas de flag active
         //  si le filtre n'est pas déjà actif et directement en actif si le filtre est déjà actif.
-        mysql_query("replace into emails set uid = {$_SESSION['uid']}, num = 0,
+        $globals->db->query("replace into emails set uid = {$_SESSION['uid']}, num = 0,
                      email = '\"|maildrop /var/mail/.maildrop_filters/"
                     .($new_filtre == 2 ? 'drop_spams':'tag_spams')." {$_SESSION['uid']}\"',
                      flags = '".(isset($filtre) ? 'active' : 'filtre')
                     .($new_filtre == 2 ? ',drop' : '')."'");
         // échange les flags active et filtre d'un seul coup (de manière atomique) si le filtre n'est pas déjà actif
         if (!isset($filtre))
-            mysql_query("UPDATE emails
+            $globals->db->query("UPDATE emails
                          SET flags=IF(FIND_IN_SET('active',flags), REPLACE(flags,'active','filtre'), REPLACE(flags,'filtre','active'))
                          WHERE uid={$_SESSION['uid']} AND (FIND_IN_SET('active',flags) OR FIND_IN_SET('filtre',flags))");
     }
 }
 
-$result = mysql_query("select find_in_set('drop', flags) from emails where uid = {$_SESSION['uid']} and num = 0 and find_in_set('active', flags)");
+$result = $globals->db->query("select find_in_set('drop', flags) from emails where uid = {$_SESSION['uid']} and num = 0 and find_in_set('active', flags)");
 list($filtre) = mysql_num_rows($result) + intval(mysql_fetch_row($result));
 mysql_free_result($result);
 $page->assign('filtre',$filtre);
diff --git a/htdocs/auth-groupex.php b/htdocs/auth-groupex.php
index 60d98a8..a973c89 100644
--- a/htdocs/auth-groupex.php
+++ b/htdocs/auth-groupex.php
@@ -17,7 +17,7 @@ new_skinned_page('index.tpl',AUTH_COOKIE);
 // mise à jour de l'heure et de la machine de dernier login sauf quand on est en suid
 $newhost=strtolower(gethostbyaddr($_SERVER["REMOTE_ADDR"]));
 if (!isset($_SESSION['suid'])) {
-    mysql_query("UPDATE auth_user_md5 SET host='$newhost',lastlogin=NULL WHERE user_id=".$_SESSION['uid']);
+    $globals->db->query("UPDATE auth_user_md5 SET host='$newhost',lastlogin=NULL WHERE user_id=".$_SESSION['uid']);
 }
 
 /* cree le champs "auth" renvoye au Groupe X */
@@ -49,7 +49,7 @@ function gpex_make_params($chlg, $privkey, $datafields) {
 }
 
 /* on parcourt les entrees de groupes_auth */
-$res = mysql_query("select privkey,name,datafields from groupesx_auth");
+$res = $globals->db->query("select privkey,name,datafields from groupesx_auth");
 while (list($privkey,$name,$datafields) = mysql_fetch_row($res)) {
     if (md5($gpex_challenge.$privkey) == $gpex_pass) {
         $returl = $gpex_url.gpex_make_params($gpex_challenge,$privkey,$datafields);
diff --git a/htdocs/carva_redirect.php b/htdocs/carva_redirect.php
index 046df95..e77cf1c 100644
--- a/htdocs/carva_redirect.php
+++ b/htdocs/carva_redirect.php
@@ -4,7 +4,7 @@ new_skinned_page('carva_redirect.tpl', AUTH_MDP);
 
 if (isset($_REQUEST['submit']) and ($_REQUEST['submit'] == "Valider" or $_REQUEST['submit'] == "Modifier") and isset($_REQUEST['url'])) {
     // on change la redirection (attention à http://)
-    mysql_query("update auth_user_md5 set redirecturl = '{$_REQUEST['url']}'"
+    $globals->db->query("update auth_user_md5 set redirecturl = '{$_REQUEST['url']}'"
               ." where user_id = '{$_SESSION['uid']}'");
     if (mysql_errno($conn) == 0) {
         $_SESSION['log']->log("carva_add","http://".$_REQUEST['url']);
@@ -15,7 +15,7 @@ if (isset($_REQUEST['submit']) and ($_REQUEST['submit'] == "Valider" or $_REQUES
     }
 } elseif (isset($_REQUEST['submit']) and $_REQUEST['submit'] == "Supprimer") {
     // on supprime la redirection
-    mysql_query("update auth_user_md5 set redirecturl = '' where user_id = {$_SESSION['uid']}");
+    $globals->db->query("update auth_user_md5 set redirecturl = '' where user_id = {$_SESSION['uid']}");
     if (mysql_errno($conn) == 0) {
         $_SESSION['log']->log("carva_del",$_REQUEST['url']);
         $_POST['url'] = '';
@@ -25,7 +25,7 @@ if (isset($_REQUEST['submit']) and ($_REQUEST['submit'] == "Valider" or $_REQUES
     }
 }
 
-$result = mysql_query("select alias, redirecturl from auth_user_md5 where user_id={$_SESSION['uid']}");
+$result = $globals->db->query("select alias, redirecturl from auth_user_md5 where user_id={$_SESSION['uid']}");
 list($alias, $carva) = mysql_fetch_row($result);
 mysql_free_result($result);
 $page->assign('carva', $carva);
diff --git a/htdocs/cookie_on.php b/htdocs/cookie_on.php
index 62fa0c4..06cea2e 100644
--- a/htdocs/cookie_on.php
+++ b/htdocs/cookie_on.php
@@ -2,7 +2,7 @@
 require("auto.prepend.inc.php");
 new_skinned_page('cookie_on.tpl', AUTH_MDP);
 
-$res = @mysql_query( "SELECT password FROM auth_user_md5 WHERE user_id='{$_SESSION['uid']}'" );
+$res = @$globals->db->query( "SELECT password FROM auth_user_md5 WHERE user_id='{$_SESSION['uid']}'" );
 list($password)=mysql_fetch_row($res);
 $cookie=md5($password);
 @mysql_free_result($res);
diff --git a/htdocs/emails.php b/htdocs/emails.php
index ef9501a..4a2ed0e 100644
--- a/htdocs/emails.php
+++ b/htdocs/emails.php
@@ -3,7 +3,7 @@ require("auto.prepend.inc.php");
 new_skinned_page('emails.tpl',AUTH_COOKIE);
 
 // on regarde si on a affaire à un homonyme
-$res = mysql_query("SELECT username!=loginbis AND loginbis!='',alias FROM auth_user_md5 WHERE username = '".$_SESSION["username"]."'");
+$res = $globals->db->query("SELECT username!=loginbis AND loginbis!='',alias FROM auth_user_md5 WHERE username = '".$_SESSION["username"]."'");
 list($is_homonyme,$alias) = mysql_fetch_row($res);
 mysql_free_result($res);
 $page->assign('is_homonyme', $is_homonyme);
@@ -18,7 +18,7 @@ $page->mysql_assign($sql, 'mails', 'nb_mails');
 
 // on regarde si l'utilisateur a un alias et si oui on l'affiche !
 $sql = "SELECT domain FROM groupex.aliases WHERE id=12 AND email like '".$_SESSION['username']."'";
-$result = mysql_query($sql);
+$result = $globals->db->query($sql);
 if ($result && list($aliases) = mysql_fetch_row($result))
     $page->assign('melix', substr($aliases,0,-3));
 mysql_free_result($result);
diff --git a/htdocs/epouse.php b/htdocs/epouse.php
index 9749654..5530e13 100644
--- a/htdocs/epouse.php
+++ b/htdocs/epouse.php
@@ -4,7 +4,7 @@ require("validations.inc.php");
 
 new_skinned_page('epouse.tpl', AUTH_MDP);
 
-$res = mysql_query("select u.nom,u.epouse,i.flags from auth_user_md5 as u
+$res = $globals->db->query("select u.nom,u.epouse,i.flags from auth_user_md5 as u
                     left join identification as i using(matricule)
                     where user_id=".$_SESSION['uid']);
 list($nom,$epouse_old,$flags) = mysql_fetch_row($res);
diff --git a/htdocs/exit.php b/htdocs/exit.php
index a631030..cf3277a 100644
--- a/htdocs/exit.php
+++ b/htdocs/exit.php
@@ -3,7 +3,7 @@ require("auto.prepend.inc.php");
 new_skinned_page('index.tpl',AUTH_MDP);
 
 if (isset($_SESSION['suid'])) {
-    $res = @mysql_query( "SELECT username,prenom,nom,promo,perms FROM auth_user_md5 WHERE user_id='{$_SESSION['suid']}'");
+    $res = @$globals->db->query( "SELECT username,prenom,nom,promo,perms FROM auth_user_md5 WHERE user_id='{$_SESSION['suid']}'");
     if(@mysql_num_rows($res) != 0) {
         list($username,$prenom,$nom,$promo,$perms)=mysql_fetch_row($res);
         // on rétablit les loggers
diff --git a/htdocs/getphoto.php b/htdocs/getphoto.php
index 9ac453d..8349a25 100644
--- a/htdocs/getphoto.php
+++ b/htdocs/getphoto.php
@@ -15,7 +15,7 @@ if(isset($_REQUEST['x'])) {
 		Header("Content-type: image/".$myphoto->mimetype);
 		echo $myphoto->data;
 	} else {
-		$result = mysql_query("SELECT attachmime, attach FROM photo WHERE uid = '{$_REQUEST['x']}'");
+		$result = $globals->db->query("SELECT attachmime, attach FROM photo WHERE uid = '{$_REQUEST['x']}'");
 
 		if(  list($type,$data) = @mysql_fetch_row($result) ) {
 			Header(  "Content-type: image/$type");
diff --git a/htdocs/groupex/export-econfiance.php b/htdocs/groupex/export-econfiance.php
index e535a25..74d6ecb 100644
--- a/htdocs/groupex/export-econfiance.php
+++ b/htdocs/groupex/export-econfiance.php
@@ -10,7 +10,7 @@ if (isset($_SESSION["chall"]) && $_SESSION["chall"] != "" && $_GET["PASS"] == md
 
 require("db_connect.inc.php");
 
-$all = mysql_query("SELECT prenom,nom,username FROM auth_user_md5 as u,listes_ins as i WHERE i.idu=u.user_id AND i.idl=174 AND i.idu != 0 ORDER BY nom");
+$all = $globals->db->query("SELECT prenom,nom,username FROM auth_user_md5 as u,listes_ins as i WHERE i.idu=u.user_id AND i.idl=174 AND i.idu != 0 ORDER BY nom");
 
 $res = "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n\n<membres>\n\n";
 
diff --git a/htdocs/login.php b/htdocs/login.php
index 2c0f812..9ba19b9 100644
--- a/htdocs/login.php
+++ b/htdocs/login.php
@@ -2,7 +2,7 @@
 require("auto.prepend.inc.php");
 new_skinned_page('login.tpl', AUTH_COOKIE, true);
 
-$param=mysql_query("SELECT date,naissance FROM auth_user_md5 WHERE user_id={$_SESSION['uid']};");
+$param=$globals->db->query("SELECT date,naissance FROM auth_user_md5 WHERE user_id={$_SESSION['uid']};");
 list($date,$naissance) = mysql_fetch_row($param);
 mysql_free_result($param);
 
@@ -14,7 +14,7 @@ if ($naissance==0)  {
 
 // incitation à mettre à jour la fiche
 
-$res = mysql_query("SELECT date FROM auth_user_md5 WHERE user_id=".$_SESSION["uid"]);
+$res = $globals->db->query("SELECT date FROM auth_user_md5 WHERE user_id=".$_SESSION["uid"]);
 list($d) = mysql_fetch_row($res);
 $date_maj = mktime(0, 0, 0, substr($d, 5, 2), substr($d, 8, 2), substr($d, 0, 4));
 if(( (time() - $date_maj) > 60 * 60 * 24 * 400)) { // si fiche date de + de 400j;
@@ -23,14 +23,14 @@ if(( (time() - $date_maj) > 60 * 60 * 24 * 400)) { // si fiche date de + de 400j
 
 // incitation à mettre une photo
 
-$res = mysql_query("SELECT 1 FROM photo WHERE uid=".$_SESSION["uid"]);
+$res = $globals->db->query("SELECT 1 FROM photo WHERE uid=".$_SESSION["uid"]);
 if (mysql_num_rows($res) == 0)
     $page->assign('photo_incitation', true);
 mysql_free_result($res);
 
 // affichage de la boîte avec quelques liens
 
-$res = mysql_query("SELECT id FROM newsletter ORDER BY date DESC");
+$res = $globals->db->query("SELECT id FROM newsletter ORDER BY date DESC");
 list($nb) = mysql_fetch_row($res);
 mysql_free_result($res);
 
diff --git a/htdocs/mescontacts.php b/htdocs/mescontacts.php
index 42bea5c..19d19b4 100644
--- a/htdocs/mescontacts.php
+++ b/htdocs/mescontacts.php
@@ -7,18 +7,18 @@ require("applis.func.inc.php");
 if (isset($_REQUEST['action'])) {
     if($_REQUEST['action']=='retirer') {
 
-        if (($res = mysql_query("SELECT user_id FROM auth_user_md5 WHERE username='{$_REQUEST['user']}'")) && mysql_num_rows($res)==1) {
+        if (($res = $globals->db->query("SELECT user_id FROM auth_user_md5 WHERE username='{$_REQUEST['user']}'")) && mysql_num_rows($res)==1) {
             list($cont_user_id) = mysql_fetch_row($res);
-            if (mysql_query("DELETE FROM contacts WHERE uid = '{$_SESSION['uid']}' AND contact='$cont_user_id'"))
+            if ($globals->db->query("DELETE FROM contacts WHERE uid = '{$_SESSION['uid']}' AND contact='$cont_user_id'"))
                 $page->assign('erreur', "<p class='normal'><strong>Contact {$_REQUEST['user']} retiré !</strong></p>\n");
         }
 
         // si l'utilisateur demande l'ajout de qqun à sa liste
     } elseif ($_REQUEST["action"]=="ajouter") {
 
-        if (($res = mysql_query("SELECT user_id FROM auth_user_md5 WHERE username='".$_REQUEST["user"]."'")) && mysql_num_rows($res)==1) {
+        if (($res = $globals->db->query("SELECT user_id FROM auth_user_md5 WHERE username='".$_REQUEST["user"]."'")) && mysql_num_rows($res)==1) {
             list($cont_user_id) = mysql_fetch_row($res);
-            if (mysql_query("INSERT INTO contacts set uid = '{$_SESSION['uid']}', contact = '$cont_user_id'")) {
+            if ($globals->db->query("INSERT INTO contacts set uid = '{$_SESSION['uid']}', contact = '$cont_user_id'")) {
                 $page->assign('erreur', '<p class="normal"><strong>Contact ajouté !</strong></p>');
             } else
                 $page->assign('erreur', '<p class="erreur">Contact déjà dans la liste !</p>');
@@ -52,7 +52,7 @@ $sql = "SELECT contact AS id,
         LEFT  JOIN geoloc_region  AS gr  ON (adr.pays = gr.a2 AND adr.region = gr.region)
         WHERE c.uid = {$_SESSION['uid']}
         ORDER BY a.nom, a.prenom";
-mysql_query($sql);
+$globals->db->query($sql);
 echo mysql_error();
 
 $page->mysql_assign($sql,'contacts','nb_contacts');
diff --git a/htdocs/mescontacts_ldif.php b/htdocs/mescontacts_ldif.php
index 7d3cd98..6de2e7d 100644
--- a/htdocs/mescontacts_ldif.php
+++ b/htdocs/mescontacts_ldif.php
@@ -25,7 +25,7 @@ $page->register_modifier('utf8', 'utf8_encode');
  * On construit la liste des contacts, et de l'entreprise à laquelle ils appartiennent
  */
 $contacts = Array();
-$req = mysql_query("SELECT contact AS id, date, prenom, nom, epouse, username, mobile, web, libre, promo, alias,
+$req = $globals->db->query("SELECT contact AS id, date, prenom, nom, epouse, username, mobile, web, libre, promo, alias,
                            entreprise, adr1, adr2, adr3, cp, ville, gp.pays, gr.name, tel, fax,
                            poste, f.label AS fonction
                     FROM      contacts      AS c 
@@ -44,7 +44,7 @@ mysql_free_result($req);
 /*
  * On y ajoute les infos d'adresses
  */
-$req = mysql_query(
+$req = $globals->db->query(
        "SELECT c.contact AS id, adr1, adr2, adr3, cp, ville, gp.pays, gr.name, tel, fax
         FROM       contacts      AS c
         INNER JOIN adresses      AS a  ON (a.uid = c.contact AND FIND_IN_SET('active', a.statut))
diff --git a/htdocs/motdepassemd5.php b/htdocs/motdepassemd5.php
index e129c1e..a621959 100644
--- a/htdocs/motdepassemd5.php
+++ b/htdocs/motdepassemd5.php
@@ -5,7 +5,7 @@ if (!empty($_POST['response2']))  {             // la variable $response existe-
     // OUI, alors changeons le mot de passe
     $password = $_POST['response2'];
     $sql = "UPDATE auth_user_md5 SET password='$password' WHERE user_id=".$_SESSION['uid'];
-    mysql_query($sql);
+    $globals->db->query($sql);
     $_SESSION['log']->log("passwd","");
     new_skinned_page('motdepassemd5.success.tpl', AUTH_MDP);
     $page->run();
diff --git a/htdocs/newsletter.php b/htdocs/newsletter.php
index 8d4fd83..84cb3a1 100644
--- a/htdocs/newsletter.php
+++ b/htdocs/newsletter.php
@@ -3,9 +3,9 @@ require("auto.prepend.inc.php");
 new_skinned_page('newsletter.tpl', AUTH_COOKIE);
 
 if (isset($_REQUEST['last']))
-    $res=mysql_query("SELECT UNIX_TIMESTAMP(date),titre,text FROM newsletter ORDER BY id DESC LIMIT 1");
+    $res=$globals->db->query("SELECT UNIX_TIMESTAMP(date),titre,text FROM newsletter ORDER BY id DESC LIMIT 1");
 elseif (isset($_REQUEST['nl_id'])) 
-    $res=mysql_query("SELECT UNIX_TIMESTAMP(date),titre,text FROM newsletter WHERE id='{$_REQUEST['nl_id']}'");
+    $res=$globals->db->query("SELECT UNIX_TIMESTAMP(date),titre,text FROM newsletter WHERE id='{$_REQUEST['nl_id']}'");
 else
     $res="";
 
diff --git a/htdocs/pattecassee.php b/htdocs/pattecassee.php
index 07028bd..6677f08 100644
--- a/htdocs/pattecassee.php
+++ b/htdocs/pattecassee.php
@@ -18,7 +18,7 @@ function valide_email($str) {
 if (array_key_exists('email', $_GET) && array_key_exists('action', $_GET)) {
     $email = valide_email($_GET['email']);
     // vérifications d'usage
-    $sel = mysql_query(
+    $sel = $globals->db->query(
       "SELECT e.uid, a.username
        FROM emails AS e
        INNER JOIN auth_user_md5 AS a ON e.uid = a.user_id
@@ -54,7 +54,7 @@ L'
 } elseif (array_key_exists('email', $_POST)) {
     $email = valide_email($_POST['email']);
     $page->assign('email',$email);
-    $sel = mysql_query("SELECT e1.uid, e1.panne != 0 AS panne, count(e2.uid) AS nb_mails, u.nom, u.prenom, u.promo
+    $sel = $globals->db->query("SELECT e1.uid, e1.panne != 0 AS panne, count(e2.uid) AS nb_mails, u.nom, u.prenom, u.promo
                         FROM emails as e1
                         LEFT JOIN emails as e2 ON(e1.uid = e2.uid AND FIND_IN_SET('active', e2.flags) AND e1.num != e2.num)
                         INNER JOIN auth_user_md5 as u ON(e1.uid = u.user_id)
@@ -63,7 +63,7 @@ L'
     if ($x = mysql_fetch_assoc($sel)) {
         // on écrit dans la base que l'adresse est cassée
         if (!$x['panne'])
-            mysql_query("UPDATE emails SET panne='".date("Y-m-d")."' WHERE email =  '".$email."'");
+            $globals->db->query("UPDATE emails SET panne='".date("Y-m-d")."' WHERE email =  '".$email."'");
         $page->assign_by_ref('x',$x);
     }
 }
diff --git a/htdocs/redirect/redirect.php b/htdocs/redirect/redirect.php
index 6b3c170..e5e5c11 100644
--- a/htdocs/redirect/redirect.php
+++ b/htdocs/redirect/redirect.php
@@ -12,7 +12,7 @@ echo "</pre>";*/
 // REQUEST_URI = /prenom.nom(/path/fichier.hmtl)?
 list($username, $path) = preg_split('/\//', $_SERVER["REQUEST_URI"], 2, PREG_SPLIT_NO_EMPTY);
 
-$result = mysql_query("select redirecturl from auth_user_md5 where username= '$username' or alias = '$username'");
+$result = $globals->db->query("select redirecturl from auth_user_md5 where username= '$username' or alias = '$username'");
 if ($result and list($url) = mysql_fetch_row($result) and $url != '') {
 	// on envoie un redirect (PHP met automatiquement le code de retour 302
 	if (!empty($path)) {
diff --git a/htdocs/skins.php b/htdocs/skins.php
index 1b7fe87..1ae6ec1 100644
--- a/htdocs/skins.php
+++ b/htdocs/skins.php
@@ -3,7 +3,7 @@ require("auto.prepend.inc.php");
 new_skinned_page('skins.tpl', AUTH_COOKIE);
 
 if (isset($_REQUEST['submit']))  {  // formulaire soumis, traitons les données envoyées
-    mysql_query("UPDATE auth_user_md5
+    $globals->db->query("UPDATE auth_user_md5
                 SET skin={$_REQUEST['newskin']}
                 WHERE user_id={$_SESSION['uid']}");
     set_skin();
diff --git a/htdocs/stats/coupure.php b/htdocs/stats/coupure.php
index 886fece..3f7390d 100644
--- a/htdocs/stats/coupure.php
+++ b/htdocs/stats/coupure.php
@@ -13,7 +13,7 @@ function serv_to_str($params) {
     return implode(', ',$ret);
 }
 if (isset($_REQUEST['cp_id'])) 
-    $res=mysql_query("select UNIX_TIMESTAMP(debut) AS debut, TIME_FORMAT(duree,'%kh%i') AS duree, resume, description, services from coupures where id='{$_REQUEST['cp_id']}'");
+    $res=$globals->db->query("select UNIX_TIMESTAMP(debut) AS debut, TIME_FORMAT(duree,'%kh%i') AS duree, resume, description, services from coupures where id='{$_REQUEST['cp_id']}'");
 else
     $res="";
 
diff --git a/htdocs/stats/graph_promo.php b/htdocs/stats/graph_promo.php
index a621c4e..366bbec 100644
--- a/htdocs/stats/graph_promo.php
+++ b/htdocs/stats/graph_promo.php
@@ -12,7 +12,7 @@ $JOURS=364;
 define('DUREEJOUR',24*3600);
 
 //recupere le nombre d'inscriptions par jour sur la plage concernée
-$donnees=mysql_query("SELECT if(date_ins>DATE_SUB(NOW(),INTERVAL $JOURS DAY), TO_DAYS(date_ins)-TO_DAYS(NOW()), ".(-($JOURS+1)).") AS jour,
+$donnees=$globals->db->query("SELECT if(date_ins>DATE_SUB(NOW(),INTERVAL $JOURS DAY), TO_DAYS(date_ins)-TO_DAYS(NOW()), ".(-($JOURS+1)).") AS jour,
                              count(username) AS nb
                       FROM auth_user_md5 WHERE promo = $promo GROUP BY jour");
 
diff --git a/htdocs/stats/nb_by_promo.php b/htdocs/stats/nb_by_promo.php
index ea6350c..cb44fc4 100644
--- a/htdocs/stats/nb_by_promo.php
+++ b/htdocs/stats/nb_by_promo.php
@@ -2,7 +2,7 @@
 require("auto.prepend.inc.php");
 new_skinned_page('stats/nb_by_promo.tpl', AUTH_COOKIE);
 
-$result = mysql_query("SELECT promo,COUNT(*) FROM auth_user_md5 WHERE promo > 1900 GROUP BY promo ORDER BY promo");
+$result = $globals->db->query("SELECT promo,COUNT(*) FROM auth_user_md5 WHERE promo > 1900 GROUP BY promo ORDER BY promo");
 $max=0; $min=3000;
 while(list($promo,$nb)=mysql_fetch_row($result)) {
     $promo=intval($promo);
diff --git a/htdocs/trezo/gere_operations.php b/htdocs/trezo/gere_operations.php
index 73effc4..b182d62 100644
--- a/htdocs/trezo/gere_operations.php
+++ b/htdocs/trezo/gere_operations.php
@@ -39,7 +39,7 @@ if ($mois_sel) {
 switch($action) {
     case "edit":
         if ($operation_id) {
-            $res=mysql_query("select date,label,credit,debit from trezo.operations where id='$operation_id'");
+            $res=$globals->db->query("select date,label,credit,debit from trezo.operations where id='$operation_id'");
             list($operation_date,$operation_label,$operation_credit,$operation_debit)=mysql_fetch_row($res);
         }
     break;
@@ -70,7 +70,7 @@ switch($action) {
     break;
     case "del":
         if ($operation_id) {
-            mysql_query("delete from trezo.operations where id='".$operation_id."'");
+            $globals->db->query("delete from trezo.operations where id='".$operation_id."'");
         }
     break;
 
diff --git a/htdocs/vcard.php b/htdocs/vcard.php
index 5b9e6d1..5c13535 100644
--- a/htdocs/vcard.php
+++ b/htdocs/vcard.php
@@ -59,7 +59,7 @@ $myquery =
     "SELECT prenom, nom, epouse, username, mobile, web, libre, promo, alias, user_id, date
     FROM auth_user_md5 AS a
     WHERE username='{$_REQUEST['x']}'";
-    $result=mysql_query($myquery);
+    $result=$globals->db->query($myquery);
 if (mysql_num_rows($result)!=1) {
     echo 'erreur';
     exit;
@@ -68,7 +68,7 @@ $vcard = mysql_fetch_assoc($result);
 $page->assign_by_ref('vcard', $vcard);
 mysql_free_result($result);
 
-$adr = mysql_query(
+$adr = $globals->db->query(
         "SELECT statut,adr1,adr2,adr3,cp,ville,gp.pays,gr.name,tel,fax,
         FIND_IN_SET('courrier', a.statut) AS courrier
         FROM adresses as a
@@ -86,7 +86,7 @@ mysql_free_result($adr);
 $page->assign_by_ref('home', $home);
 
 
-$adr = mysql_query(
+$adr = $globals->db->query(
         "SELECT adr1,adr2,adr3,cp,ville,gp.pays,gr.name,tel,fax,poste,entreprise,f.label as fonction
         FROM entreprises as e
         LEFT JOIN emploi_naf AS f ON(e.fonction = f.id)
diff --git a/include/applis.func.inc.php b/include/applis.func.inc.php
index 30eb66d..80583ff 100644
--- a/include/applis.func.inc.php
+++ b/include/applis.func.inc.php
@@ -9,7 +9,7 @@
  * @see include/form_rech_av.inc.php
 function applis_options($current=0) {
   echo '<option value="-1"></option>';
-  $res=mysql_query("select * from applis_def order by text");
+  $res=$globals->db->query("select * from applis_def order by text");
   while ($arr_appli=mysql_fetch_array($res)) { 
     echo '<option value="'.$arr_appli["id"].'"';
     if ($arr_appli["id"]==$current) echo " selected";
diff --git a/include/domaine.inc.php b/include/domaine.inc.php
index 2de6097..a2285b6 100644
--- a/include/domaine.inc.php
+++ b/include/domaine.inc.php
@@ -13,7 +13,7 @@ function liste_domaines() {
             (has_perms() ? '' : " AND g.did = d.id AND g.uid = {$_SESSION['uid']}").
            " ORDER BY domain";
 
-    $result = mysql_query($sql);
+    $result = $globals->db->query($sql);
 
     $ret = Array();
     while (list($domaine) = mysql_fetch_row($result)) {
@@ -36,15 +36,15 @@ function add_domain($domaine) {
         $sql = "SELECT 1 FROM groupex.aliases AS a, groupex.gestionnaires AS g
                 WHERE g.uid = {$_SESSION['uid']} AND a.id = g.did AND a.domain NOT LIKE '%@%'
                     AND a.domain NOT LIKE '%polytechnique.org'";
-        $result = mysql_query($sql);
+        $result = $globals->db->query($sql);
         $ok = (mysql_num_rows($result) < 1);
     }
     if ($ok) {
         // ok, ajout du domaine et des droits d'utilisation (sauf si admin)
-        if(mysql_query("insert into groupex.aliases set domain = '$domaine'")) {;
+        if($globals->db->query("insert into groupex.aliases set domain = '$domaine'")) {;
         $did = mysql_insert_id();
             if ($_SESSION['perms'] != 'admin')
-            if(mysql_query("INSERT INTO groupex.gestionnaires SET did = $did, uid = {$_SESSION['uid']}"))
+            if($globals->db->query("INSERT INTO groupex.gestionnaires SET did = $did, uid = {$_SESSION['uid']}"))
                 return "<p class='erreur'>Félicitations, ton domaine a été ajouté aux domaines gérés par Polytechnique.org.\n"
                     .  "Clique sur le lien ci-dessous pour lui ajouter des alias</p>\n";
         } else
diff --git a/include/sondage.requetes.inc.php b/include/sondage.requetes.inc.php
index 498a3fb..5d3441f 100644
--- a/include/sondage.requetes.inc.php
+++ b/include/sondage.requetes.inc.php
@@ -23,8 +23,8 @@ function est_vide($donnees) {
  * @param $requete la requête MySQL à exécuter
  * @return $resultat le résultat de la requête
  */
-function mysql_query_p($requete) {
-    $resultat = mysql_query($requete);
+function $globals->db->query_p($requete) {
+    $resultat = $globals->db->query($requete);
     if ($resultat == false) {
 		erreur("Erreur dans une requête.");
 		require("footer.inc.php");
@@ -37,8 +37,8 @@ function mysql_query_p($requete) {
  * @param $requete la requête MySQL
  * @return $resultat le résultat de la requête
  */
-function mysql_query_p_non_vide($requete) {
-	$resultat = mysql_query_p($requete);
+function $globals->db->query_p_non_vide($requete) {
+	$resultat = $globals->db->query_p($requete);
 	if (mysql_num_rows($resultat) <= 0) {
 		erreur("Erreur : pas d'enregistrement correspondant à la requête.");
 		require("footer.inc.php");
@@ -63,7 +63,7 @@ function usernames($liste) {
  * @return $res un tableau d'enregistrements (promo,nom,prenom)
  */
 function moderateurs($SID) {
-	$resultat = mysql_query_p("select user_id,prenom,nom,promo,username ".
+	$resultat = $globals->db->query_p("select user_id,prenom,nom,promo,username ".
 	"from x4dat.auth_user_md5 as u,sondage.moderateurs as m ".
 	"where u.user_id=m.idu and m.ids=$SID order by promo,nom,prenom");
 	$res = null;
@@ -84,7 +84,7 @@ function moderateurs($SID) {
  * @return $res une adresse mail (chaîne)
  */
 function mail_moderateurs($SID) {
-	$resultat=mysql_query_p("select username ".
+	$resultat=$globals->db->query_p("select username ".
 	"from x4dat.auth_user_md5 as u, sondage.moderateurs as m ".
 	"where m.ids=$SID and m.idu=u.user_id");
 	$res = "";
@@ -102,7 +102,7 @@ function mail_moderateurs($SID) {
  * @return $res un tableau d'enregistrements (promo,nom,prenom)
  */
 function inscrits($SID) {
-	$resultat = mysql_query_p("select user_id,prenom,nom,promo,username ".
+	$resultat = $globals->db->query_p("select user_id,prenom,nom,promo,username ".
 	"from x4dat.auth_user_md5 as u,sondage.inscrits as i ".
 	"where u.user_id=i.idu and i.ids=$SID order by promo,nom,prenom");
 	$res = null;
@@ -123,7 +123,7 @@ function inscrits($SID) {
  * @return l'uid ou NULL s'il n'y a pas d'utilisateur avec cet username
  */
 function recupere_uid($adresse) {
-	$resultat = mysql_query_p("select user_id from x4dat.auth_user_md5 ".
+	$resultat = $globals->db->query_p("select user_id from x4dat.auth_user_md5 ".
 	"where username='$adresse'");
 	if (mysql_num_rows($resultat)<=0) {
 		erreur("Il n'y a pas d'X inscrit d'identifiant : $adresse.");
@@ -143,7 +143,7 @@ function recupere_uid($adresse) {
 function ajouter_moderateur($SID,$adresse) {
 	$UID = recupere_uid($adresse);
 	if (isset($UID))
-		mysql_query_p("insert into sondage.moderateurs (ids,idu) values($SID,$UID)");
+		$globals->db->query_p("insert into sondage.moderateurs (ids,idu) values($SID,$UID)");
 }
 
 /** ajoute un inscrit à un sondage
@@ -154,7 +154,7 @@ function ajouter_moderateur($SID,$adresse) {
 function ajouter_inscrit($SID,$adresse) {
     $UID = recupere_uid($adresse);
 	if (isset($UID))
-		mysql_query_p("insert into sondage.inscrits (ids,idu) values($SID,$UID)");
+		$globals->db->query_p("insert into sondage.inscrits (ids,idu) values($SID,$UID)");
 }
 
 /** supprime un modérateur à un sondage
@@ -163,13 +163,13 @@ function ajouter_inscrit($SID,$adresse) {
  * @return rien
  */
 function supprimer_moderateur($SID,$adresse) {
-	$resultat = mysql_query_p("select idu from sondage.moderateurs where ids=$SID");
+	$resultat = $globals->db->query_p("select idu from sondage.moderateurs where ids=$SID");
 	if (mysql_num_rows($resultat) <= 1)
 		erreur("Il doit y avoir au moins un modérateur pour un sondage.");
 	else {
         $UID = recupere_uid($adresse);
 		if (isset($UID))
-			mysql_query_p("delete from sondage.moderateurs where ids=$SID and idu=$UID");
+			$globals->db->query_p("delete from sondage.moderateurs where ids=$SID and idu=$UID");
 	}
 }
 
@@ -181,7 +181,7 @@ function supprimer_moderateur($SID,$adresse) {
 function supprimer_inscrit($SID,$adresse) {
     $UID = recupere_uid($adresse);
 	if (isset($UID))                   
-		mysql_query_p("delete from sondage.inscrits where ids=$SID and idu=$UID");
+		$globals->db->query_p("delete from sondage.inscrits where ids=$SID and idu=$UID");
 } 
 
 /** renvoie les titres des sondages qui sont/ne sont pas en production pour un certain utilisateur
@@ -194,7 +194,7 @@ function sondages($prod,$uid) {
         $not = "";
     else
         $not = "!";
-	$resultat=mysql_query_p("select d.ids,titre ".
+	$resultat=$globals->db->query_p("select d.ids,titre ".
 	"from sondage.description_generale as d,sondage.moderateurs as m ".
 	"where $not FIND_IN_SET('prod',d.flags) and d.ids=m.ids and m.idu=$uid");
 	$res = null;
@@ -227,7 +227,7 @@ function sondages_non_en_prod($uid) {
  * @return $res un enregistrement (en_prod,en_modif)
  */
 function nb_sondages_prod($uid) {
-    $resultat = mysql_query_p("select sum(FIND_IN_SET('prod',d.flags)),count(d.flags)".
+    $resultat = $globals->db->query_p("select sum(FIND_IN_SET('prod',d.flags)),count(d.flags)".
     "from sondage.description_generale as d,sondage.moderateurs as m ".
     "where d.ids=m.ids and m.idu=$uid");
     list($res->en_prod,$res->en_modif) = mysql_fetch_row($resultat);
@@ -240,7 +240,7 @@ function nb_sondages_prod($uid) {
  * @return rien
  */
 function passer_en_prod($SID,$alias) {
-	mysql_query_p("update sondage.description_generale "
+	$globals->db->query_p("update sondage.description_generale "
     . "set flags=CONCAT_WS(',',flags,'prod'), alias='$alias' where ids=$SID");
 }
 
@@ -251,7 +251,7 @@ function passer_en_prod($SID,$alias) {
  * @return un booléen
  */
 function deja_vote($SID,$user_id,$sondage) {
-	$resultat = mysql_query_p("select idu from sondage.sondes where ids=$SID and idu=$user_id");
+	$resultat = $globals->db->query_p("select idu from sondage.sondes where ids=$SID and idu=$user_id");
 	if (mysql_num_rows($resultat) > 0 && $sondage->en_prod==1)
 		return 1;
 	else
@@ -263,7 +263,7 @@ function deja_vote($SID,$user_id,$sondage) {
  * @return $res un enregistrement (titre,en_tete,pied,parties,prod,tous,mail)
  */
 function infos_sondage($SID) {
-	$resultat=mysql_query_p("select titre,en_tete,pied,mail".
+	$resultat=$globals->db->query_p("select titre,en_tete,pied,mail".
         ", FIND_IN_SET('prod',flags), !FIND_IN_SET('parties',flags), !FIND_IN_SET('tous',flags)".
 	    " from sondage.description_generale where ids=$SID");
 	$res = null;
@@ -286,7 +286,7 @@ function infos_sondage($SID) {
  */
 function obtenir_sid($alias) {
     global $sondage;
-    $resultat=mysql_query_p("select ids,titre,en_tete,pied,mail".
+    $resultat=$globals->db->query_p("select ids,titre,en_tete,pied,mail".
     ", FIND_IN_SET('prod',flags), !FIND_IN_SET('parties',flags), !FIND_IN_SET('tous',flags)".
     " from sondage.description_generale where alias='$alias'");
     if (mysql_num_rows($resultat)>0) {
@@ -309,7 +309,7 @@ function obtenir_sid($alias) {
  * @return $res un enregistrement (idp,titre,en_tete,pied,ordre)
  */
 function infos_partie($SID,$PID) {
-	$resultat=mysql_query_p("select idp,sous_titre,en_tete,pied,ordre ".
+	$resultat=$globals->db->query_p("select idp,sous_titre,en_tete,pied,ordre ".
 	"from sondage.parties where ids=$SID and idp=$PID");
 	$res = null;
 	if (mysql_num_rows($resultat)>0) {
@@ -330,7 +330,7 @@ function infos_partie($SID,$PID) {
  * @return $res un enregistrement (idq,texte,type_reponse,ordre)
  */
 function infos_question($SID,$PID,$QID) {
-	$resultat=mysql_query_p("select idq,texte,type_reponse,ordre ".
+	$resultat=$globals->db->query_p("select idq,texte,type_reponse,ordre ".
 	"from sondage.questions where ids=$SID and idp=$PID and idq=$QID");
 	$res = null;
 	if (mysql_num_rows($resultat)>0) {
@@ -352,7 +352,7 @@ function infos_question($SID,$PID,$QID) {
  * @return $res un enregistrement (idr,texte,coche,ordre)
  */
 function infos_reponse($SID,$PID,$QID,$RID) {
-	$resultat=mysql_query_p("select idr,reponse,coche,ordre ".
+	$resultat=$globals->db->query_p("select idr,reponse,coche,ordre ".
 	"from sondage.choix where ids=$SID and idp=$PID and idq=$QID and idr=$RID");
 	$res = null;
 	if (mysql_num_rows($resultat)>0) {
@@ -371,7 +371,7 @@ function infos_reponse($SID,$PID,$QID,$RID) {
  * @return $res un tableau d'enregistrements (idp,titre,en_tete,pied,ordre)
  */
 function infos_parties($SID) {
-	$resultat=mysql_query_p("select idp from sondage.parties where ids=$SID order by ordre");
+	$resultat=$globals->db->query_p("select idp from sondage.parties where ids=$SID order by ordre");
 	$res = null;
 	for ($i=0;$i<mysql_num_rows($resultat);$i++) {
 		$ligne = mysql_fetch_array($resultat);
@@ -388,16 +388,16 @@ function infos_parties($SID) {
  */
 function infos_parties_une_seule_requete($SID,$en_prod) {
     global $UNIQUE,$MULTIPLE,$QUESTION_TEXTE,$QUESTION_MULT;
-    $parties=mysql_query_p("select idp,sous_titre,en_tete,pied,ordre ".
+    $parties=$globals->db->query_p("select idp,sous_titre,en_tete,pied,ordre ".
     "from sondage.parties where ids=$SID order by idp");
-    $questions=mysql_query_p("select idp,idq,texte,type_reponse,ordre ".
+    $questions=$globals->db->query_p("select idp,idq,texte,type_reponse,ordre ".
     "from sondage.questions where ids=$SID order by idp,idq");
-    $reponses=mysql_query_p("select idp,idq,idr,reponse,coche,ordre ".
+    $reponses=$globals->db->query_p("select idp,idq,idr,reponse,coche,ordre ".
     "from sondage.choix where ids=$SID order by idp,idq,ordre");
     if ($en_prod == 1) {
-        $reponses_texte=mysql_query_p("select idp,idq,reponse from sondage.reponses_texte ".
+        $reponses_texte=$globals->db->query_p("select idp,idq,reponse from sondage.reponses_texte ".
         "where ids=$SID order by idp,idq");
-        $reponses_choix=mysql_query_p("select idp,idq,code from sondage.reponses_choix_multiple ".
+        $reponses_choix=$globals->db->query_p("select idp,idq,code from sondage.reponses_choix_multiple ".
         "where ids=$SID order by idp,idq");
         if (mysql_num_rows($reponses_texte)>0)
             $reponse_texte = mysql_fetch_array($reponses_texte);
@@ -514,7 +514,7 @@ function infos_parties_une_seule_requete($SID,$en_prod) {
  * @return $res un tableau d'enregistrements (idq,texte,type_reponse,ordre)
  */
 function infos_questions($SID,$PID) {
-        $resultat=mysql_query_p("select idq from sondage.questions where ids=$SID and idp=$PID order by ordre");
+        $resultat=$globals->db->query_p("select idq from sondage.questions where ids=$SID and idp=$PID order by ordre");
 	$res = null;			        
 	for ($i=0;$i<mysql_num_rows($resultat);$i++) {
 		$ligne = mysql_fetch_array($resultat);
@@ -530,7 +530,7 @@ function infos_questions($SID,$PID) {
  * @return $res un tableau d'enregistrements (idr,texte,coche,ordre)
  */
 function infos_reponses($SID,$PID,$QID) {
-	$resultat=mysql_query_p("select idr from sondage.choix where ids=$SID and idp=$PID and idq=$QID order by ordre");
+	$resultat=$globals->db->query_p("select idr from sondage.choix where ids=$SID and idp=$PID and idq=$QID order by ordre");
 	$res = null;
 	for ($i=0;$i<mysql_num_rows($resultat);$i++) {
 		$ligne = mysql_fetch_array($resultat);
@@ -546,7 +546,7 @@ function infos_reponses($SID,$PID,$QID) {
  * @return $res un tableau de chaînes
  */
 function reponses_texte($SID,$PID,$QID) {
-	$resultat = mysql_query_p("select reponse from sondage.reponses_texte where ids=$SID and idp=$PID and idq=$QID");
+	$resultat = $globals->db->query_p("select reponse from sondage.reponses_texte where ids=$SID and idp=$PID and idq=$QID");
 	$res = null;
 	for ($i=0;$i<mysql_num_rows($resultat);$i++) {
 		$ligne = mysql_fetch_array($resultat);
@@ -566,7 +566,7 @@ function reponses_texte($SID,$PID,$QID) {
 function reponses_choix($SID,$PID,$QID,$nb_reponses,$codage) {
 	global $UNIQUE;
 
-	$resultat = mysql_query_p("select code from sondage.reponses_choix_multiple where ids=$SID and idp=$PID and idq=$QID");
+	$resultat = $globals->db->query_p("select code from sondage.reponses_choix_multiple where ids=$SID and idp=$PID and idq=$QID");
 	for ($j=0;$j<$nb_reponses;$j++)
 		$votes[]=0;
 	for ($i=0;$i<mysql_num_rows($resultat);$i++) {
@@ -598,7 +598,7 @@ function reponses_choix($SID,$PID,$QID,$nb_reponses,$codage) {
  * @return une chaîne
  */
 function topo_req($TOPO) {
-	$resultat = mysql_query_p("select texte from sondage.topo where ref = $TOPO");
+	$resultat = $globals->db->query_p("select texte from sondage.topo where ref = $TOPO");
 	$ligne = mysql_fetch_array($resultat);
 	return $ligne["texte"];
 }
@@ -609,20 +609,20 @@ function topo_req($TOPO) {
  */
 function ajouter_sondage($user_id) {
     //on vérifie que l'utilisateur n'a pas trop de sondages
-    $resultat = mysql_query_p("select count(ids) from sondage.moderateurs where idu=$user_id");
+    $resultat = $globals->db->query_p("select count(ids) from sondage.moderateurs where idu=$user_id");
     list($nb_sondages) = mysql_fetch_row($resultat);
     if ($nb_sondages > 5) {
         erreur("Tu as atteint le quota maximal de sondages autorisés. Tu ne peux plus en créer.");
         require("footer.inc.php");
         exit;
     }
-	mysql_query_p("insert into sondage.description_generale (titre) values('')");
-    mysql_query("lock sondage.description_generale");//lock nécessaire pour le retour de SID
-	$resultat = mysql_query_p("select max(ids) from sondage.description_generale");
+	$globals->db->query_p("insert into sondage.description_generale (titre) values('')");
+    $globals->db->query("lock sondage.description_generale");//lock nécessaire pour le retour de SID
+	$resultat = $globals->db->query_p("select max(ids) from sondage.description_generale");
     $ligne = mysql_fetch_row($resultat);
 	$SID = $ligne[0];
-	mysql_query_p("insert into sondage.moderateurs (ids,idu) values($SID,$user_id)");
-    mysql_query("unlock sondage.description_generale");
+	$globals->db->query_p("insert into sondage.moderateurs (ids,idu) values($SID,$user_id)");
+    $globals->db->query("unlock sondage.description_generale");
 	return $SID;
 }
 
@@ -631,7 +631,7 @@ function ajouter_sondage($user_id) {
  * @return l'ordre de la partie
  */
 function pid_transitoire($SID) {
-	$resultat = mysql_query_p("select max(ordre) from sondage.parties where ids=$SID");
+	$resultat = $globals->db->query_p("select max(ordre) from sondage.parties where ids=$SID");
 	$ligne = mysql_fetch_array($resultat);
 	if ($ligne[0]==null)
 		return 1;
@@ -645,7 +645,7 @@ function pid_transitoire($SID) {
  * @return l'ordre de la question
  */
 function qid_transitoire($SID,$PID) {
-    $resultat = mysql_query_p("select max(ordre) from sondage.questions where ids=$SID and idp=$PID");
+    $resultat = $globals->db->query_p("select max(ordre) from sondage.questions where ids=$SID and idp=$PID");
 	$ligne = mysql_fetch_array($resultat);
 	if ($ligne[0]==null)
 		return 1;
@@ -660,7 +660,7 @@ function qid_transitoire($SID,$PID) {
  * @return l'ordre du choix
  */
 function rid_transitoire($SID,$PID,$QID) {
-    $resultat = mysql_query_p("select max(ordre) from sondage.choix where ids=$SID and idp=$PID and idq=$QID");
+    $resultat = $globals->db->query_p("select max(ordre) from sondage.choix where ids=$SID and idp=$PID and idq=$QID");
 	$ligne = mysql_fetch_array($resultat);
 	if ($ligne[0]==null)
 		return 1;
@@ -673,8 +673,8 @@ function rid_transitoire($SID,$PID,$QID) {
  * @return $PID l'id de la partie créée
  */
 function ajouter_partie($SID) {
-	mysql_query("lock sondage.parties");//lock nécessaire pour le retour de PID
-	$resultat = mysql_query_p("select max(idp),max(ordre) from sondage.parties where ids = $SID");
+	$globals->db->query("lock sondage.parties");//lock nécessaire pour le retour de PID
+	$resultat = $globals->db->query_p("select max(idp),max(ordre) from sondage.parties where ids = $SID");
 	$ligne = mysql_fetch_array($resultat);
 	if ($ligne[0]==null)
 		$PID = 1;
@@ -684,8 +684,8 @@ function ajouter_partie($SID) {
         $ordre = 1;
     else
         $ordre = $ligne[1]+1;                    
-	mysql_query_p("insert into sondage.parties (ids,idp,ordre,sous_titre,en_tete,pied) values($SID,$PID,$ordre,'','','')");
-	mysql_query("unlock sondage.parties");
+	$globals->db->query_p("insert into sondage.parties (ids,idp,ordre,sous_titre,en_tete,pied) values($SID,$PID,$ordre,'','','')");
+	$globals->db->query("unlock sondage.parties");
 	return $PID;
 }
 
@@ -695,8 +695,8 @@ function ajouter_partie($SID) {
  * @return $QID l'id de la question créée
  */
 function ajouter_question($SID,$PID) {
-	mysql_query("lock sondage.questions");//lock nécessaire pour le retour de QID
-        $resultat = mysql_query_p("select max(idq),max(ordre) from sondage.questions where ids = $SID and idp=$PID");
+	$globals->db->query("lock sondage.questions");//lock nécessaire pour le retour de QID
+        $resultat = $globals->db->query_p("select max(idq),max(ordre) from sondage.questions where ids = $SID and idp=$PID");
 	$ligne = mysql_fetch_array($resultat);
 	if ($ligne[0]==null)
 		$QID = 1;
@@ -706,8 +706,8 @@ function ajouter_question($SID,$PID) {
         $ordre = 1;
     else
         $ordre = $ligne[1]+1;
-	mysql_query_p("insert into sondage.questions (ids,idp,idq,ordre,texte,type_reponse) values($SID,$PID,$QID,$ordre,'',0)");
-	mysql_query("unlock sondage.questions");
+	$globals->db->query_p("insert into sondage.questions (ids,idp,idq,ordre,texte,type_reponse) values($SID,$PID,$QID,$ordre,'',0)");
+	$globals->db->query("unlock sondage.questions");
 	return $QID;
 }
 
@@ -718,8 +718,8 @@ function ajouter_question($SID,$PID) {
  * @return $RID l'id du choix créé
  */
 function ajouter_reponse($SID,$PID,$QID) {
-	mysql_query("lock sondage.choix");//lock nécessaire pour le retour de RID
-    $resultat = mysql_query_p("select max(idr),max(ordre) from sondage.choix where ids = $SID and idp=$PID and idq=$QID");
+	$globals->db->query("lock sondage.choix");//lock nécessaire pour le retour de RID
+    $resultat = $globals->db->query_p("select max(idr),max(ordre) from sondage.choix where ids = $SID and idp=$PID and idq=$QID");
 	$ligne = mysql_fetch_array($resultat);
 	if ($ligne[0]==null)
 		$RID = 1;
@@ -729,8 +729,8 @@ function ajouter_reponse($SID,$PID,$QID) {
         $ordre = 1;
     else
         $ordre = $ligne[1]+1;
-	mysql_query_p("insert into sondage.choix (ids,idp,idq,idr,ordre) values($SID,$PID,$QID,$RID,$ordre)");
-	mysql_query("unlock sondage.choix");
+	$globals->db->query_p("insert into sondage.choix (ids,idp,idq,idr,ordre) values($SID,$PID,$QID,$RID,$ordre)");
+	$globals->db->query("unlock sondage.choix");
 	return $RID;
 }
 
@@ -750,7 +750,7 @@ function mettre_a_jour_sondage($SID,$titre,$en_tete,$pied,$prod,$parties,$tous,$
     $flags = ($prod == 1 ? 'prod,' : '');
     $flags .= ($parties != 1 ? 'parties,' : '');
     $flags .= ($tous != 1 ? 'tous,' : '');
-	mysql_query_p("update sondage.description_generale "
+	$globals->db->query_p("update sondage.description_generale "
     ."set titre='$titre',en_tete='$en_tete',pied='$pied', flags = '$flags', mail='$mail' where ids=$SID");
 }
 
@@ -763,7 +763,7 @@ function mettre_a_jour_sondage($SID,$titre,$en_tete,$pied,$prod,$parties,$tous,$
  * @return rien
  */
 function mettre_a_jour_partie($SID,$PID,$titre,$en_tete,$pied) {
-    mysql_query_p("update sondage.parties set sous_titre='$titre',en_tete='$en_tete',pied='$pied' ".
+    $globals->db->query_p("update sondage.parties set sous_titre='$titre',en_tete='$en_tete',pied='$pied' ".
     "where ids=$SID and idp=$PID");
 }
 
@@ -776,7 +776,7 @@ function mettre_a_jour_partie($SID,$PID,$titre,$en_tete,$pied) {
  * @return rien
  */
 function mettre_a_jour_question($SID,$PID,$QID,$texte,$type_question) {
-    mysql_query_p("update sondage.questions set texte='$texte',type_reponse='$type_question' ".
+    $globals->db->query_p("update sondage.questions set texte='$texte',type_reponse='$type_question' ".
     "where ids=$SID and idp=$PID and idq=$QID");
 }
 
@@ -791,7 +791,7 @@ function mettre_a_jour_question($SID,$PID,$QID,$texte,$type_question) {
  */
 function mettre_a_jour_reponse($SID,$PID,$QID,$RID,$texte,$coche) {
 	if ($texte!="") {
-		mysql_query_p("update sondage.choix set reponse='$texte',coche='$coche' ".
+		$globals->db->query_p("update sondage.choix set reponse='$texte',coche='$coche' ".
         "where ids=$SID and idp=$PID and idq=$QID and idr=$RID");
 	}
 }
@@ -802,9 +802,9 @@ function mettre_a_jour_reponse($SID,$PID,$QID,$RID,$texte,$coche) {
  * @return rien
  */
 function supprimer_partie($SID,$PID) {
-	mysql_query_p("delete from sondage.parties where ids=$SID and idp=$PID");
-	mysql_query_p("delete from sondage.questions where ids=$SID and idp=$PID");
-	mysql_query_p("delete from sondage.choix where ids=$SID and idp=$PID");
+	$globals->db->query_p("delete from sondage.parties where ids=$SID and idp=$PID");
+	$globals->db->query_p("delete from sondage.questions where ids=$SID and idp=$PID");
+	$globals->db->query_p("delete from sondage.choix where ids=$SID and idp=$PID");
 }
 
 /** supprimer une question
@@ -814,8 +814,8 @@ function supprimer_partie($SID,$PID) {
  * @return rien
  */
 function supprimer_question($SID,$PID,$QID) {
-	mysql_query_p("delete from sondage.questions where ids=$SID and idp=$PID and idq=$QID");
-	mysql_query_p("delete from sondage.choix where ids=$SID and idp=$PID and idq=$QID");
+	$globals->db->query_p("delete from sondage.questions where ids=$SID and idp=$PID and idq=$QID");
+	$globals->db->query_p("delete from sondage.choix where ids=$SID and idp=$PID and idq=$QID");
 }
 
 /** supprimer un choix de réponse
@@ -826,7 +826,7 @@ function supprimer_question($SID,$PID,$QID) {
  * @return rien
  */
 function supprimer_reponse($SID,$PID,$QID,$RID) {
-	mysql_query_p("delete from sondage.choix where ids=$SID and idp=$PID and idq=$QID and idr=$RID");
+	$globals->db->query_p("delete from sondage.choix where ids=$SID and idp=$PID and idq=$QID and idr=$RID");
 }
 
 /** échanger la position de deux parties
@@ -837,9 +837,9 @@ function supprimer_reponse($SID,$PID,$QID,$RID) {
  */
 function echanger_partie($SID,$PID1,$PID2,$temp) {
 	//$temp = pid_transitoire($SID);
-	mysql_query_p("update sondage.parties set ordre=$temp where ids=$SID and ordre=$PID1");
-	mysql_query_p("update sondage.parties set ordre=$PID1 where ids=$SID and ordre=$PID2");
-	mysql_query_p("update sondage.parties set ordre=$PID2 where ids=$SID and ordre=$temp");
+	$globals->db->query_p("update sondage.parties set ordre=$temp where ids=$SID and ordre=$PID1");
+	$globals->db->query_p("update sondage.parties set ordre=$PID1 where ids=$SID and ordre=$PID2");
+	$globals->db->query_p("update sondage.parties set ordre=$PID2 where ids=$SID and ordre=$temp");
 }
 
 /** échanger la position de deux questions
@@ -851,9 +851,9 @@ function echanger_partie($SID,$PID1,$PID2,$temp) {
  */
 function echanger_question($SID,$PID,$QID1,$QID2,$temp) {
 	//$temp = qid_transitoire($SID,$PID);
-	mysql_query_p("update sondage.questions set ordre=$temp where ids=$SID and idp=$PID and ordre=$QID1");
-	mysql_query_p("update sondage.questions set ordre=$QID1 where ids=$SID and idp=$PID and ordre=$QID2");
-	mysql_query_p("update sondage.questions set ordre=$QID2 where ids=$SID and idp=$PID and ordre=$temp");
+	$globals->db->query_p("update sondage.questions set ordre=$temp where ids=$SID and idp=$PID and ordre=$QID1");
+	$globals->db->query_p("update sondage.questions set ordre=$QID1 where ids=$SID and idp=$PID and ordre=$QID2");
+	$globals->db->query_p("update sondage.questions set ordre=$QID2 where ids=$SID and idp=$PID and ordre=$temp");
 }
 
 /** échanger la position de deux choix de réponse
@@ -866,9 +866,9 @@ function echanger_question($SID,$PID,$QID1,$QID2,$temp) {
  */
 function echanger_reponse($SID,$PID,$QID,$RID1,$RID2,$temp) {
 	//$temp = rid_transitoire($SID,$PID,$QID);
-	mysql_query_p("update sondage.choix set ordre=$temp where ids=$SID and idp=$PID and idq=$QID and ordre=$RID1");
-	mysql_query_p("update sondage.choix set ordre=$RID1 where ids=$SID and idp=$PID and idq=$QID and ordre=$RID2");
-	mysql_query_p("update sondage.choix set ordre=$RID2 where ids=$SID and idp=$PID and idq=$QID and ordre=$temp");
+	$globals->db->query_p("update sondage.choix set ordre=$temp where ids=$SID and idp=$PID and idq=$QID and ordre=$RID1");
+	$globals->db->query_p("update sondage.choix set ordre=$RID1 where ids=$SID and idp=$PID and idq=$QID and ordre=$RID2");
+	$globals->db->query_p("update sondage.choix set ordre=$RID2 where ids=$SID and idp=$PID and idq=$QID and ordre=$temp");
 }
 
 /** descendre une partie d'un niveau
@@ -877,8 +877,8 @@ function echanger_reponse($SID,$PID,$QID,$RID1,$RID2,$temp) {
  * @return rien
  */
 function descendre_partie($SID,$PID) {
-	mysql_query("lock sondage.parties");//lock nécessaire pour récupérer max(ordre)
-	$resultat = mysql_query_p("select min(s1.ordre),s2.ordre ".
+	$globals->db->query("lock sondage.parties");//lock nécessaire pour récupérer max(ordre)
+	$resultat = $globals->db->query_p("select min(s1.ordre),s2.ordre ".
     "from sondage.parties as s1,sondage.parties as s2 ".
     "where s2.ids=$SID and s2.idp=$PID and s1.ids=$SID and s1.ordre>s2.ordre group by s2.ordre");
     if (mysql_num_rows($resultat)>0) {
@@ -886,7 +886,7 @@ function descendre_partie($SID,$PID) {
 	    if ($ligne[0]!=null)
 		    echanger_partie($SID,$ligne[1],$ligne[0],0);
     }
-	mysql_query("unlock sondage.parties");
+	$globals->db->query("unlock sondage.parties");
 }
 
 /** descendre une question d'un niveau
@@ -896,8 +896,8 @@ function descendre_partie($SID,$PID) {
  * @return rien
  */
 function descendre_question($SID,$PID,$QID) {
-	mysql_query("lock sondage.questions");//lock nécessaire pour récupérer max(ordre)
-	$resultat = mysql_query_p("select min(s1.ordre),s2.ordre ".
+	$globals->db->query("lock sondage.questions");//lock nécessaire pour récupérer max(ordre)
+	$resultat = $globals->db->query_p("select min(s1.ordre),s2.ordre ".
     "from sondage.questions as s1,sondage.questions as s2 ".
     "where s2.ids=$SID and s2.idp=$PID and s2.idq=$QID and ".
     "s1.ids=$SID and s1.idp=$PID and s1.ordre>s2.ordre group by s2.ordre");
@@ -906,7 +906,7 @@ function descendre_question($SID,$PID,$QID) {
 	    if ($ligne[0]!=null)
 		    echanger_question($SID,$PID,$ligne[1],$ligne[0],0);
 	}
-    mysql_query("unlock sondage.questions");
+    $globals->db->query("unlock sondage.questions");
 }
 
 /** descendre un choix de réponse d'un niveau
@@ -917,8 +917,8 @@ function descendre_question($SID,$PID,$QID) {
  * @return rien
  */
 function descendre_reponse($SID,$PID,$QID,$RID) {
-	mysql_query("lock sondage.choix");//lock nécessaire pour récupérer max(ordre)
-    $resultat = mysql_query_p("select min(s1.ordre),s2.ordre ".
+	$globals->db->query("lock sondage.choix");//lock nécessaire pour récupérer max(ordre)
+    $resultat = $globals->db->query_p("select min(s1.ordre),s2.ordre ".
     "from sondage.choix as s1,sondage.choix as s2 ".
     "where s2.ids=$SID and s2.idp=$PID and s2.idq=$QID and s2.idr=$RID and ".
     "s1.ids=$SID and s1.idp=$PID and s1.idq=$QID and s1.ordre>s2.ordre group by s2.ordre");
@@ -927,7 +927,7 @@ function descendre_reponse($SID,$PID,$QID,$RID) {
 	    if ($ligne[0]!=null)
 		    echanger_reponse($SID,$PID,$QID,$ligne[1],$ligne[0],0);
 	}
-    mysql_query("unlock sondage.choix");
+    $globals->db->query("unlock sondage.choix");
 }
 
 /** monter une partie d'un niveau
@@ -936,8 +936,8 @@ function descendre_reponse($SID,$PID,$QID,$RID) {
  * @return rien
  */
 function monter_partie($SID,$PID) {
-	mysql_query("lock sondage.parties");//lock nécessaire pour récupérer max(ordre)
-    $resultat = mysql_query_p("select max(s1.ordre),s2.ordre ".
+	$globals->db->query("lock sondage.parties");//lock nécessaire pour récupérer max(ordre)
+    $resultat = $globals->db->query_p("select max(s1.ordre),s2.ordre ".
     "from sondage.parties as s1,sondage.parties as s2 ".
     "where s2.ids=$SID and s2.idp=$PID and s1.ids=$SID and s1.ordre<s2.ordre group by s2.ordre");
     if (mysql_num_rows($resultat)>0) {
@@ -945,7 +945,7 @@ function monter_partie($SID,$PID) {
 	    if ($ligne[0]!=null)
 		    echanger_partie($SID,$ligne[1],$ligne[0],0);
 	}
-    mysql_query("unlock sondage.parties");
+    $globals->db->query("unlock sondage.parties");
 }
 
 /** monter une question d'un niveau
@@ -955,8 +955,8 @@ function monter_partie($SID,$PID) {
  * @return rien
  */
 function monter_question($SID,$PID,$QID) {
-	mysql_query("lock sondage.questions");//lock nécessaire pour récupérer max(ordre)
-    $resultat = mysql_query_p("select max(s1.ordre),s2.ordre ".
+	$globals->db->query("lock sondage.questions");//lock nécessaire pour récupérer max(ordre)
+    $resultat = $globals->db->query_p("select max(s1.ordre),s2.ordre ".
     "from sondage.questions as s1,sondage.questions as s2 ".
     "where s2.ids=$SID and s2.idp=$PID and s2.idq=$QID and ".
     "s1.ids=$SID and s1.idp=$PID and s1.ordre<s2.ordre group by s2.ordre");
@@ -965,7 +965,7 @@ function monter_question($SID,$PID,$QID) {
 	    if ($ligne[0]!=null)
 		    echanger_question($SID,$PID,$ligne[1],$ligne[0],0);
 	}
-    mysql_query("unlock sondage.questions");
+    $globals->db->query("unlock sondage.questions");
 }
 
 /** monter un choix de réponse d'un niveau
@@ -976,8 +976,8 @@ function monter_question($SID,$PID,$QID) {
  * @return rien
  */
 function monter_reponse($SID,$PID,$QID,$RID) {
-	mysql_query("lock sondage.choix");//lock nécessaire pour récupérer max(ordre)
-    $resultat = mysql_query_p("select max(s1.ordre),s2.ordre ".
+	$globals->db->query("lock sondage.choix");//lock nécessaire pour récupérer max(ordre)
+    $resultat = $globals->db->query_p("select max(s1.ordre),s2.ordre ".
     "from sondage.choix as s1,sondage.choix as s2 ".
     "where s2.ids=$SID and s2.idp=$PID and s2.idq=$QID and s2.idr=$RID and ".
     "s1.ids=$SID and s1.idp=$PID and s1.idq=$QID and s1.ordre<s2.ordre group by s2.ordre");
@@ -986,7 +986,7 @@ function monter_reponse($SID,$PID,$QID,$RID) {
 	    if ($ligne[0]!=null)                                                    
 		    echanger_reponse($SID,$PID,$QID,$ligne[1],$ligne[0],0);
 	}
-    mysql_query("unlock sondage.choix");
+    $globals->db->query("unlock sondage.choix");
 } 
 								
 ?>
diff --git a/include/trezo.inc.php b/include/trezo.inc.php
index eace898..265b739 100644
--- a/include/trezo.inc.php
+++ b/include/trezo.inc.php
@@ -37,7 +37,7 @@ function solde_until($date='')
     $sql = "select sum(credit)-sum(debit) from trezo.operations";
     if(!empty($date))
         $sql .= " where date <= '$date'";
-    $res = mysql_query($sql);
+    $res = $globals->db->query($sql);
     list($mysolde) = mysql_fetch_row($res);
     return $mysolde;
 }
diff --git a/include/valid_aliases.inc.php b/include/valid_aliases.inc.php
index 35481b2..5660bff 100644
--- a/include/valid_aliases.inc.php
+++ b/include/valid_aliases.inc.php
@@ -13,7 +13,7 @@ class AliasReq extends Validate {
         $this->alias = $_alias;
         $this->raison = $_raison;
         
-        $sql = mysql_query("SELECT username,prenom,nom,domain FROM auth_user_md5 as u "
+        $sql = $globals->db->query("SELECT username,prenom,nom,domain FROM auth_user_md5 as u "
                         .  "LEFT JOIN groupex.aliases as a ON (a.email = u.username and a.id = 12)    "
                         .  "WHERE user_id='".$this->uid."'");
         list($this->username,$this->prenom,$this->nom,$this->old) = mysql_fetch_row($sql);
@@ -57,8 +57,8 @@ class AliasReq extends Validate {
         if($no_update_bd) return false;
 
         $domain=$this->alias.'@melix.net';
-        mysql_query("DELETE FROM groupex.aliases WHERE id=12 AND email='{$this->username}'");
-        mysql_query("INSERT INTO groupex.aliases SET email='{$this->username}',domain='$domain',id=12");         
+        $globals->db->query("DELETE FROM groupex.aliases WHERE id=12 AND email='{$this->username}'");
+        $globals->db->query("INSERT INTO groupex.aliases SET email='{$this->username}',domain='$domain',id=12");         
     }
 }
 
diff --git a/include/valid_epouses.inc.php b/include/valid_epouses.inc.php
index 813871a..84453ce 100644
--- a/include/valid_epouses.inc.php
+++ b/include/valid_epouses.inc.php
@@ -22,7 +22,7 @@ class EpouseReq extends Validate {
         if(empty($_epouse))
             $this->alias = "<span class=\"erreur\">suppression</a>";
         
-        $sql = mysql_query("select u1.alias, u1.epouse, u1.prenom, u1.nom"
+        $sql = $globals->db->query("select u1.alias, u1.epouse, u1.prenom, u1.nom"
             .", IFNULL(u2.username,u3.username)"
             ." FROM auth_user_md5 as u1"
             ." LEFT JOIN auth_user_md5 as u2"
@@ -75,7 +75,7 @@ class EpouseReq extends Validate {
         if($no_update_bd) return false;
         
         $alias = ($this->epouse ? $this->alias : "");
-        mysql_query("UPDATE auth_user_md5 set epouse='".$this->epouse."',epouse_soundex='".soundex_fr($this->epouse)."',alias='".$this->alias."' WHERE user_id=".$this->uid);
+        $globals->db->query("UPDATE auth_user_md5 set epouse='".$this->epouse."',epouse_soundex='".soundex_fr($this->epouse)."',alias='".$this->alias."' WHERE user_id=".$this->uid);
     }
 }
 
diff --git a/include/valid_evts.inc.php b/include/valid_evts.inc.php
index 2f0a67b..dd5936b 100644
--- a/include/valid_evts.inc.php
+++ b/include/valid_evts.inc.php
@@ -24,7 +24,7 @@ class EvtReq extends Validate {
         $this->pmax = $_pmax;
         $this->peremption = $_peremption;
         $this->comment = $_comment;
-        $req = mysql_query("SELECT username,promo,nom,prenom FROM "
+        $req = $globals->db->query("SELECT username,promo,nom,prenom FROM "
           ."auth_user_md5 WHERE user_id='$_uid'");
         list($this->username,$this->promo,$this->nom,$this->prenom) 
             = mysql_fetch_row($req);
@@ -45,21 +45,21 @@ class EvtReq extends Validate {
             $mymail->assign('titre',$this->titre);
 
             if($_REQUEST['action']=="Valider") {
-                mysql_query("UPDATE evenements
+                $globals->db->query("UPDATE evenements
                              SET creation_date = creation_date, validation_user_id = {$_SESSION['uid']},
                                  validation_date = NULL, flags = CONCAT(flags,',valide')
                              WHERE id='{$this->evtid}' LIMIT 1");
                 $mymail->assign('answer','yes');
             }
             if($_REQUEST['action']=="Invalider") {
-                mysql_query("UPDATE evenements
+                $globals->db->query("UPDATE evenements
                              SET creation_date = creation_date, validation_user_id = {$_SESSION['uid']},
                                  validation_date = NULL, flags = REPLACE(flags,'valide','')
                              WHERE id='{$this->evtid}' LIMIT 1");
                 $mymail->assign('answer', 'no');
             }
             if($_REQUEST['action']=="Supprimer") {
-                mysql_query("DELETE from evenements WHERE id='{$this->evtid}' LIMIT 1");
+                $globals->db->query("DELETE from evenements WHERE id='{$this->evtid}' LIMIT 1");
             }
             if ($_POST['action']!="Supprimer")
                 $mymail->send();
diff --git a/include/valid_ml.inc.php b/include/valid_ml.inc.php
index 702df86..d53ad55 100644
--- a/include/valid_ml.inc.php
+++ b/include/valid_ml.inc.php
@@ -28,7 +28,7 @@ class MListReq extends Validate {
         $this->moderos = $_moderos;
         $this->membres = $_membres;
         
-        $sql = mysql_query("SELECT username,prenom,nom FROM auth_user_md5 WHERE user_id=".$this->uid);
+        $sql = $globals->db->query("SELECT username,prenom,nom FROM auth_user_md5 WHERE user_id=".$this->uid);
         list($this->username,$this->prenom,$this->nom) = mysql_fetch_row($sql);
         mysql_free_result($sql);
     }
@@ -38,7 +38,7 @@ class MListReq extends Validate {
     }
 
     function formu() {
-        $sql = mysql_query("SELECT username FROM auth_user_md5"
+        $sql = $globals->db->query("SELECT username FROM auth_user_md5"
             ." WHERE user_id IN ({$this->moderos})"
             ." ORDER BY nom, prenom");
         $tab = array();
@@ -46,7 +46,7 @@ class MListReq extends Validate {
         $this->moderos_txt = implode(', ', $tab);
         mysql_free_result($sql);
 
-        $sql = mysql_query("SELECT username FROM auth_user_md5"
+        $sql = $globals->db->query("SELECT username FROM auth_user_md5"
             ." WHERE user_id IN ({$this->membres})"
             ." ORDER BY nom, prenom");
         $tab = array();
@@ -105,14 +105,14 @@ class MListReq extends Validate {
         if ($this->archive) $type->addflag('archive');
         if ($this->freeins) $type->addflag('freeins'); 
         
-        mysql_query("INSERT INTO listes_def SET type='".$type->value."', topic='{$this->topic}'");
+        $globals->db->query("INSERT INTO listes_def SET type='".$type->value."', topic='{$this->topic}'");
         echo "<p class=\"normal\">Liste {$this->alias} créée</p>\n";
     
         if(!mysql_errno()) {
             $id = mysql_insert_id();
             if ($this->archive)
-                mysql_query("replace into listes_ins set idl=$id, idu=0");
-            mysql_query("INSERT INTO aliases (alias,type,id) VALUES".
+                $globals->db->query("replace into listes_ins set idl=$id, idu=0");
+            $globals->db->query("INSERT INTO aliases (alias,type,id) VALUES".
                     "('{$this->alias}','liste',$id)".
                     ",('owner-{$this->alias}','liste-owner',$id)".
                     ",('sm-{$this->alias}','liste-sans-moderation',$id)".
@@ -127,7 +127,7 @@ class MListReq extends Validate {
                         $values[] = "($id,$tok)";
                     }
                     $values = implode(',', $values);
-                    mysql_query("INSERT INTO listes_mod (idl, idu) VALUES $values");
+                    $globals->db->query("INSERT INTO listes_mod (idl, idu) VALUES $values");
                 }
 
                 // ajout des membres si précisés
@@ -138,15 +138,15 @@ class MListReq extends Validate {
                         $values[] = "($id,$tok)";
                     }
                     $values = implode(',', $values);
-                    mysql_query("INSERT INTO listes_ins (idl, idu) VALUES $values");
+                    $globals->db->query("INSERT INTO listes_ins (idl, idu) VALUES $values");
                 }
 
                 $this->clean();
                 return true;
             } else { // alias déjà existant ?
-                mysql_query("DELETE FROM aliases WHERE id='$id'");
-                mysql_query("DELETE FROM listes_ins WHERE id='$id'");
-                mysql_query("DELETE FROM listes_def WHERE id='$id'");
+                $globals->db->query("DELETE FROM aliases WHERE id='$id'");
+                $globals->db->query("DELETE FROM listes_ins WHERE id='$id'");
+                $globals->db->query("DELETE FROM listes_def WHERE id='$id'");
                 echo "<p class=\"erreur\">Nom déjà utilisé (owner-{$this->alias} ou {$this->alias}-request)</p>\n";
                 return false;
             } // if mysql_errno == 0 pour insert dans aliases
diff --git a/include/valid_photos.inc.php b/include/valid_photos.inc.php
index e861bd7..3416725 100644
--- a/include/valid_photos.inc.php
+++ b/include/valid_photos.inc.php
@@ -14,7 +14,7 @@ class PhotoReq extends Validate {
         global $erreur;
 
         $this->Validate($_uid, true, 'photo', $_stamp);
-        $sql = mysql_query("SELECT username, prenom, nom FROM auth_user_md5 WHERE user_id=".$this->uid);
+        $sql = $globals->db->query("SELECT username, prenom, nom FROM auth_user_md5 WHERE user_id=".$this->uid);
         list($this->username,$this->prenom,$this->nom) = mysql_fetch_row($sql);
         mysql_free_result($sql);
         
@@ -83,7 +83,7 @@ class PhotoReq extends Validate {
         global $no_update_bd;
         if($no_update_bd) return false;
         
-        mysql_query("REPLACE INTO photo set uid='".$this->uid."', attachmime = '".$this->mimetype."', attach='"
+        $globals->db->query("REPLACE INTO photo set uid='".$this->uid."', attachmime = '".$this->mimetype."', attach='"
             .addslashes($this->data)."', x='".$this->x."', y='".$this->y."'");
     }
 }
diff --git a/include/valid_sondages.inc.php b/include/valid_sondages.inc.php
index eb36078..ffed26f 100644
--- a/include/valid_sondages.inc.php
+++ b/include/valid_sondages.inc.php
@@ -13,11 +13,11 @@ class SondageReq extends Validate {
         $this->Validate($_uid, false, 'sondage', $_stamp);
         $this->sid = $_sid;
         
-        $sql = mysql_query("SELECT username,prenom,nom FROM auth_user_md5 "
+        $sql = $globals->db->query("SELECT username,prenom,nom FROM auth_user_md5 "
             .   "WHERE user_id='".$this->uid."'");
         list($this->username,$this->prenom,$this->nom) = mysql_fetch_row($sql);
         mysql_free_result($sql);
-        $sql = mysql_query("SELECT titre FROM sondage.description_generale "
+        $sql = $globals->db->query("SELECT titre FROM sondage.description_generale "
             .   "WHERE ids='".$this->sid."'");
         list($this->titre) = mysql_fetch_row($sql);
         mysql_free_result($sql);
@@ -51,7 +51,7 @@ class SondageReq extends Validate {
                     return "<p class='erreur'>L'alias ne doit pas contenir le caractère '</p>";
                 }
                 else {//on vérifie que l'alias n'existe pas déjà
-                    $resultat = mysql_query("select alias from sondage.description_generale ".
+                    $resultat = $globals->db->query("select alias from sondage.description_generale ".
                     "where alias='$alias'");
                     if (mysql_num_rows($resultat)>0) {
                         return "<p class='erreur'>Cet alias est déjà utilisé.</p>";
diff --git a/include/validations.inc.php b/include/validations.inc.php
index d1e4a1f..9208610 100644
--- a/include/validations.inc.php
+++ b/include/validations.inc.php
@@ -1,6 +1,6 @@
 <?php
 /* vim: set expandtab shiftwidth=4 tabstop=4 softtabstop=4 textwidth=100:
- * $Id: validations.inc.php,v 1.6 2004-02-07 17:18:15 x2000habouzit Exp $
+ * $Id: validations.inc.php,v 1.7 2004-02-20 09:54:45 x2000habouzit Exp $
  *
  */
 
@@ -13,7 +13,7 @@ class ValidateIterator {
     
     /** constructeur */
     function ValidateIterator () {
-        $this->sql = mysql_query("SELECT data,stamp FROM requests ORDER BY stamp");
+        $this->sql = $globals->db->query("SELECT data,stamp FROM requests ORDER BY stamp");
     }
 
     /** renvoie l'objet suivant, ou false */
@@ -54,7 +54,7 @@ class Validate {
      * à utiliser uniquement pour récupérer un objet <strong>unique</strong>
      */
     function get_unique_request($uid,$type) {
-        $sql = mysql_query("SELECT data,stamp FROM requests WHERE user_id='$uid' and type='$type'");
+        $sql = $globals->db->query("SELECT data,stamp FROM requests WHERE user_id='$uid' and type='$type'");
         if(list($result,$stamp) = mysql_fetch_row($sql)) {
             $result = unserialize($result);
             // on ne fait <strong>jamais</strong> confiance au timestamp de l'objet,
@@ -77,7 +77,7 @@ class Validate {
      * à utiliser uniquement pour récupérer un objet dans la BD avec Validate::get_request(...)
      */
     function get_request($uid, $type, $stamp) {
-        $sql = mysql_query("SELECT data,stamp"
+        $sql = $globals->db->query("SELECT data,stamp"
             ." FROM requests"
             ." WHERE user_id='$uid' and type = '$type' and stamp='$stamp'");
         if(list($result,$stamp) = mysql_fetch_row($sql)) {
@@ -110,22 +110,22 @@ class Validate {
     function submit () {
         global $no_update_bd;
         if($no_update_bd) return false;
-        mysql_query("LOCK requests"); // le lock est obligatoire pour récupérer le dernier stamp !
+        $globals->db->query("LOCK requests"); // le lock est obligatoire pour récupérer le dernier stamp !
         
         if($this->unique)
-            mysql_query("DELETE FROM requests WHERE user_id='".$this->uid
+            $globals->db->query("DELETE FROM requests WHERE user_id='".$this->uid
                     .   "' AND type='".$this->type."'");
        
-        mysql_query("INSERT INTO requests SET user_id='".$this->uid."', type='".$this->type
+        $globals->db->query("INSERT INTO requests SET user_id='".$this->uid."', type='".$this->type
                 .   "', data='".addslashes(serialize($this))."'");
 
         // au cas où l'objet est réutilisé après un commit, il faut mettre son stamp à jour
-        $sql = mysql_query("SELECT MAX(stamp) FROM requests "
+        $sql = $globals->db->query("SELECT MAX(stamp) FROM requests "
                 .   "WHERE user_id='".$this->uid."' AND type='".$this->type."'");
         list($this->stamp) = mysql_fetch_row($sql);
         mysql_free_result($sql);
 
-        mysql_query("UNLOCK requests");
+        $globals->db->query("UNLOCK requests");
         return true;
     }
     
@@ -135,7 +135,7 @@ class Validate {
     function clean () {
         global $no_update_bd;
         if($no_update_bd) return false;
-        return mysql_query("DELETE FROM requests WHERE user_id='".$this->uid."' AND type='".$this->type."'"
+        return $globals->db->query("DELETE FROM requests WHERE user_id='".$this->uid."' AND type='".$this->type."'"
                 .($this->unique ? "" : " AND stamp='".$this->stamp."'"));
     }
     
diff --git a/include/xorg.misc.inc.php b/include/xorg.misc.inc.php
index 8350763..5081489 100644
--- a/include/xorg.misc.inc.php
+++ b/include/xorg.misc.inc.php
@@ -9,19 +9,19 @@ function isvalid_email_local($email) {
   // et MySQL ne sait pas utiliser les index dans ce cas
   // (ce n'est plus vrai dans MySQL 4.x donc quand on y passera, on pourra
   // combiner les 2 requêtes suivantes en une seule)
-  $req = mysql_query("select count(*) from auth_user_md5 where username='$email'");
+  $req = $globals->db->query("select count(*) from auth_user_md5 where username='$email'");
   list($nb)=mysql_fetch_row($req);
   mysql_free_result($req);
   if ($nb>0) return true;
 
-  $req = mysql_query("select count(*) from auth_user_md5 where alias='$email'");
+  $req = $globals->db->query("select count(*) from auth_user_md5 where alias='$email'");
   list($nb)=mysql_fetch_row($req);
   mysql_free_result($req);
   if ($nb>0) return true;
 
   // vérification des adresses types $liste et $liste-request
   // ATTENTION, il ne faut pas accepter les adresses types owner-$liste et sm-$liste
-  $req = mysql_query("select count(*) from aliases where (alias='$email' and type='liste') or (alias='$email-request' and type='liste-request')");
+  $req = $globals->db->query("select count(*) from aliases where (alias='$email' and type='liste') or (alias='$email-request' and type='liste-request')");
   list($nb)=mysql_fetch_row($req);
   mysql_free_result($req);
   if ($nb>0) return true;
diff --git a/include/xorg.page.inc.php b/include/xorg.page.inc.php
index ecb14a7..10d63dd 100644
--- a/include/xorg.page.inc.php
+++ b/include/xorg.page.inc.php
@@ -105,7 +105,8 @@ class XorgPage extends DiogenesCorePage {
     function doAuth() { }
 
     function mysql_assign($sql_query,$var_name,$var_nb_name='') {
-        $sql = mysql_query($sql_query);
+        global $globals;
+        $sql = $globals->db->query($sql_query);
         if(mysql_errno())
             return(mysql_error($sql));
 
diff --git a/include/xorg.session.inc.php b/include/xorg.session.inc.php
index 12368ef..216b01f 100644
--- a/include/xorg.session.inc.php
+++ b/include/xorg.session.inc.php
@@ -26,7 +26,7 @@ class XorgSession extends DiogenesCoreSession {
     {
       // si on vient de recevoir une identification par passwordpromptscreen.tpl
       // ou passwordpromptscreenlogged.tpl
-      $res = @mysql_query( "SELECT username,user_id,password FROM auth_user_md5 WHERE username='{$_REQUEST['username']}'");
+      $res = @$globals->db->query( "SELECT username,user_id,password FROM auth_user_md5 WHERE username='{$_REQUEST['username']}'");
       if(@mysql_num_rows($res) != 0) {
         list($username,$uid,$password)=mysql_fetch_row($res);
         mysql_free_result($res);
@@ -154,7 +154,7 @@ function try_cookie() {
     if(!isset($_COOKIE['ORGaccess']) or $_COOKIE['ORGaccess'] == '' or !isset($_COOKIE['ORGlogin']))
         return -1;
 
-    $res = @mysql_query( "SELECT user_id,password FROM auth_user_md5 WHERE username='{$_COOKIE['ORGlogin']}'");
+    $res = @$globals->db->query( "SELECT user_id,password FROM auth_user_md5 WHERE username='{$_COOKIE['ORGlogin']}'");
     if(@mysql_num_rows($res) != 0) {
       list($uid,$password)=mysql_fetch_row($res);
       mysql_free_result($res);
@@ -173,7 +173,7 @@ function try_cookie() {
  * @see controlpermanent.inc.php controlauthentication.inc.php
  */
 function start_connexion ($username, $uid, $identified) {
-  $result=mysql_query("SELECT prenom, nom, perms, promo, UNIX_TIMESTAMP(lastnewslogin), UNIX_TIMESTAMP(lastlogin), host, matricule FROM auth_user_md5 WHERE user_id=$uid;");
+  $result=$globals->db->query("SELECT prenom, nom, perms, promo, UNIX_TIMESTAMP(lastnewslogin), UNIX_TIMESTAMP(lastlogin), host, matricule FROM auth_user_md5 WHERE user_id=$uid;");
   list($prenom, $nom, $perms, $promo, $lastnewslogin, $lastlogin, $host, $matricule) = mysql_fetch_row($result);
   mysql_free_result($result);
   // on garde le logger si il existe (pour ne pas casser les sessions lors d'une
@@ -188,7 +188,7 @@ function start_connexion ($username, $uid, $identified) {
     // mise à jour de la date de dernière connexion
     // sauf lorsque l'on est en SUID
     $newhost=strtolower(gethostbyaddr($_SERVER['REMOTE_ADDR']));
-    mysql_query("UPDATE auth_user_md5 SET host='$newhost',lastlogin=NULL WHERE user_id=$uid;");
+    $globals->db->query("UPDATE auth_user_md5 SET host='$newhost',lastlogin=NULL WHERE user_id=$uid;");
     $_SESSION['lastlogin'] = $lastlogin;
     $_SESSION['host'] = $host;
   }
@@ -201,7 +201,7 @@ function start_connexion ($username, $uid, $identified) {
   $_SESSION['perms'] = $perms;
   $_SESSION['promo'] = $promo;
   $_SESSION['lastnewslogin'] = $lastnewslogin;
-  $res = mysql_query("SELECT flags FROM identification WHERE matricule = '$matricule' AND FIND_IN_SET(flags, 'femme')");
+  $res = $globals->db->query("SELECT flags FROM identification WHERE matricule = '$matricule' AND FIND_IN_SET(flags, 'femme')");
   $_SESSION['femme'] = mysql_num_rows($res) > 0;
   mysql_free_result($res);
   // on récupère le logger si il existe, sinon, on logge la connexion
@@ -215,12 +215,12 @@ function start_connexion ($username, $uid, $identified) {
 
 function set_skin() {
   if(logged()) {
-    $result = mysql_query("SELECT skin,skin_tpl
+    $result = $globals->db->query("SELECT skin,skin_tpl
                            FROM auth_user_md5 AS a INNER JOIN skins AS s
                            ON a.skin=s.id WHERE user_id='{$_SESSION['uid']}' AND skin_tpl != ''");
     if(list($_SESSION['skin_id'], $_SESSION['skin']) = mysql_fetch_row($result)) {
       if ($_SESSION['skin_id'] == SKIN_STOCHASKIN_ID) {
-          $res = mysql_query("SELECT id,skin FROM skins
+          $res = $globals->db->query("SELECT id,skin FROM skins
                               WHERE !FIND_IN_SET('cachee',type) order by rand() limit 1");
           list($_SESSION['skin_id'], $_SESSION['skin']) = mysql_fetch_row($res);
           mysql_free_result($res);
-- 
2.1.4