only htdocs/marketing and include/profil left

git-archimport-id: opensource@polytechnique.org--2005/platal--mainline--0.9--patch-199

diff --git a/htdocs/admin/admin_trombino.php b/htdocs/admin/admin_trombino.php
index 0ff8f25..e6713c5 100644 (file)
--- a/htdocs/admin/admin_trombino.php
+++ b/htdocs/admin/admin_trombino.php
@@ -23,11 +23,12 @@ require_once("xorg.inc.php");
 new_admin_page('admin/admin_trombino.tpl');
 
 $uid = Env::getInt('uid');
-$q   = $globals->db->query("SELECT  a.alias,promo
-                              FROM  auth_user_md5 AS u
-                        INNER JOIN  aliases       AS a ON ( u.user_id = a.id AND type='a_vie' )
-                             WHERE  user_id = $uid");
-list($forlife, $promo) = mysql_fetch_row($q);
+$q   = $globals->xdb->query(
+        "SELECT  a.alias,promo
+          FROM  auth_user_md5 AS u
+    INNER JOIN  aliases       AS a ON ( u.user_id = a.id AND type='a_vie' )
+         WHERE  user_id = {?}", $uid);
+list($forlife, $promo) = $q->fetchOneRow();
 
 switch (Env::get('action')) {
 
@@ -42,13 +43,13 @@ switch (Env::get('action')) {
        list($x, $y) = getimagesize($_FILES['userfile']['tmp_name']);
        $mimetype = substr($_FILES['userfile']['type'], 6);
        unlink($_FILES['userfile']['tmp_name']);
-        $globals->db->query("REPLACE INTO  photo
-                                      SET  uid=$uid,  attachmime = '$mimetype',
-                                           attach='".addslashes($data)."', x=$x, y=$y");
+        $globals->xdb->execute(
+                "REPLACE INTO photo SET uid={?}, attachmime = {?}, attach={?}, x={?}, y={?}",
+                $uid, $mimetype, $data, $x, $y);
        break;
 
     case "supprimer":
-        $globals->db->query("DELETE FROM photo WHERE uid = $uid");
+        $globals->xdb->execute('DELETE FROM photo WHERE uid = {?}', $uid);
         break;
 }
 

diff --git a/htdocs/admin/deces_promo.php b/htdocs/admin/deces_promo.php
index c1ec4d2..1b03a74 100644 (file)
--- a/htdocs/admin/deces_promo.php
+++ b/htdocs/admin/deces_promo.php
@@ -31,11 +31,11 @@ if (Env::has('add10')) $promo += 10;
 $page->assign('promo',$promo);
 
 if (Env::get('valider') == "Valider") {
-    $res = $globals->db->query("SELECT user_id,matricule,deces FROM auth_user_md5 WHERE promo = $promo");
-    while (list($uid,$mat,$deces) = mysql_fetch_row($res)) {
+    $res = $globals->xdb->iterRow("SELECT user_id,matricule,deces FROM auth_user_md5 WHERE promo = {?}", $promo);
+    while (list($uid,$mat,$deces) = $res->next()) {
         $val = Env::get($mat);
        if($val == $deces) continue;
-       $globals->db->query("UPDATE auth_user_md5 SET deces='$val' WHERE matricule = '$mat'");
+       $globals->xdb->execute('UPDATE auth_user_md5 SET deces={?} WHERE matricule = {?}', $val, $mat);
        if($deces=='0000-00-00' or empty($deces)) {
            require_once('notifs.inc.php');
            register_watch_op($uid, WATCH_DEATH, $val);

diff --git a/htdocs/admin/emails_bounces_re.php b/htdocs/admin/emails_bounces_re.php
index d5537d0..af767c3 100644 (file)
--- a/htdocs/admin/emails_bounces_re.php
+++ b/htdocs/admin/emails_bounces_re.php
@@ -24,9 +24,10 @@ new_admin_page('admin/emails_bounces_re.tpl');
 
 if (Post::has('submit')) {
     foreach (Env::getMixed('lvl') as $id=>$val) {
-        $globals->db->query("REPLACE INTO  emails_bounces_re (id,pos,lvl,re,text)
-                                   VALUES  ($id, '{$_POST['pos'][$id]}', '{$_POST['lvl'][$id]}',
-                                                 '{$_POST['re'][$id]}', '{$_POST['text'][$id]}')");
+        $globals->xdb->query(
+                "REPLACE INTO emails_bounces_re (id,pos,lvl,re,text) VALUES ({?}, {?}, {?}, {?}, {?})",
+                $id, $_POST['pos'][$id], $_POST['lvl'][$id], $_POST['re'][$id], $_POST['text'][$id]
+        );
     }
 }
 

diff --git a/htdocs/admin/evenements.php b/htdocs/admin/evenements.php
index afb266e..9cbc943 100644 (file)
--- a/htdocs/admin/evenements.php
+++ b/htdocs/admin/evenements.php
@@ -28,52 +28,33 @@ $page->assign('arch', $arch);
 
 switch(Post::get('action')) {
     case "Proposer":
-       $req = "UPDATE  evenements
-                  SET  titre='".Post::get('titre')."', texte='".Post::get('texte')."', peremption='".Post::get('peremption')."',
-                       promo_min = ".Post::get('promo_min').", promo_max = ".Post::get('promo_max')."
-                 WHERE  id = $evid
-                 LIMIT  1";
-        $result = $globals->db->query ($req);
+        $globals->xdb->execute('UPDATE evenements SET titre={?}, texte={?}, peremption={?}, promo_min={?}, promo_max={?} WHERE id = {?}', 
+                Post::get('titre'), Post::get('texte'), Post::get('peremption'), Post::get('promo_min'), Post::get('promo_max'));
         break;
 
     case "Valider":
-       // le 'creation_date = creation_date' est indispensable pour que 
-       // creation_date conserve sa valeur.
-       $req="UPDATE  evenements
-                 SET  creation_date = creation_date, flags = CONCAT(flags,',valide')
-               WHERE  id = $evid
-               LIMIT  1";
-        $result = $globals->db->query ($req);
+        $globals->xdb->execute('UPDATE evenements SET creation_date = creation_date, flags = CONCAT(flags,",valide") WHERE id = {?}', $evid);
         break;
 
     case "Invalider":
-       // le 'creation_date = creation_date' est indispensable pour que 
-       // creation_date conserve sa valeur.
-       $req="UPDATE  evenements
-                 SET  creation_date = creation_date, flags = REPLACE(flags, 'valide','')
-               WHERE  id = $evid
-               LIMIT  1";
-        $result = $globals->db->query ($req);
+        $globals->xdb->execute('UPDATE evenements SET creation_date = creation_date, flags = REPLACE(flags,"valide", "") WHERE id = {?}', $evid);
         break;
 
     case "Supprimer":
-       $req="DELETE from evenements WHERE id = $evid LIMIT 1";
-        $result = $globals->db->query ($req);
+        $globals->xdb->execute('DELETE from evenements WHERE id = {?}', $evid);
         break;
 
     case "Archiver":
-       $req="UPDATE evenements SET flags = CONCAT(flags,',archive') WHERE id = $evid LIMIT 1";
-        $result = $globals->db->query ($req);
+        $globals->xdb->execute('UPDATE evenements SET creation_date = creation_date, flags = CONCAT(flags,",archive") WHERE id = {?}', $evid);
         break;
 
     case "Desarchiver":
-       $req="UPDATE evenements SET flags = REPLACE(flags,'archive','') WHERE id = $evid LIMIT 1";
-        $result = $globals->db->query ($req);
+        $globals->xdb->execute('UPDATE evenements SET creation_date = creation_date, flags = REPLACE(flags,"archive","") WHERE id = {?}', $evid);
         break;
 
     case "Editer":
-       $evt_req = $globals->db->query("SELECT titre, texte, peremption, promo_min, promo_max FROM evenements WHERE id= $evid");
-        list($titre, $texte, $peremption, $promo_min, $promo_max) = mysql_fetch_row($evt_req) ;
+        $res = $globals->xdb->query('SELECT titre, texte, peremption, promo_min, promo_max FROM evenements WHERE id={?}', $evid);
+        list($titre, $texte, $peremption, $promo_min, $promo_max) = $res->fetchOneRow();
         $page->assign('mode', 'edit');
         $page->assign('titre',$titre);
         $page->assign('texte',$texte);

diff --git a/htdocs/admin/homonymes.php b/htdocs/admin/homonymes.php
index ed20e12..88b5707 100644 (file)
--- a/htdocs/admin/homonymes.php
+++ b/htdocs/admin/homonymes.php
@@ -27,18 +27,18 @@ $op     = Env::get('op', 'list');
 $target = Env::getInt('target');
 
 if ($target) {
-    $res = $globals->db->query("SELECT  prenom,nom,a.alias AS forlife,h.alias AS loginbis
-                                  FROM  auth_user_md5 AS u
-                           INNER JOIN  aliases       AS a ON (a.id=u.user_id AND a.type='a_vie')
-                           INNER JOIN  aliases       AS h ON (h.id=u.user_id AND h.expire!='')
-                                WHERE  user_id = $target");
-    if (! list($prenom,$nom,$forlife,$loginbis) = mysql_fetch_row($res)) {
+    $res = $globals->xdb->query("SELECT  prenom,nom,a.alias AS forlife,h.alias AS loginbis
+                                   FROM  auth_user_md5 AS u
+                             INNER JOIN  aliases       AS a ON (a.id=u.user_id AND a.type='a_vie')
+                             INNER JOIN  aliases       AS h ON (h.id=u.user_id AND h.expire!='')
+                                  WHERE  user_id = {?}", $target);
+    if (! list($prenom,$nom,$forlife,$loginbis) = $res->fetchOneRow()) {
         $target=0;
     } else {
         $page->assign('nom',$nom);
         $page->assign('prenom',$prenom);
         $page->assign('forlife',$forlife);
-       $page->assign('loginbis',$loginbis);
+        $page->assign('loginbis',$loginbis);
     }
 }
 
@@ -56,46 +56,45 @@ if ($target) {
     switch ($op) {
         case 'mail':
             $mymail = new HermesMailer();
-           $mymail->setFrom($FROM);
-           $mymail->setSubject("Dans 2 semaines, suppression de $loginbis@polytechnique.org");
-           $mymail->addTo("$prenom $nom <$forlife@polytechnique.org>");
-           $mymail->addCc($cc);
+            $mymail->setFrom($FROM);
+            $mymail->setSubject("Dans 2 semaines, suppression de $loginbis@polytechnique.org");
+            $mymail->addTo("$prenom $nom <$forlife@polytechnique.org>");
+            $mymail->addCc($cc);
             $mymail->setTxtBody(Env::get('mailbody'));
             $mymail->send();
             $op = 'list';
             break;
         case 'correct':
-            $globals->db->query("UPDATE aliases SET type='homonyme',expire=NOW() WHERE alias='$loginbis'");
-            $globals->db->query("REPLACE INTO homonymes (homonyme_id,user_id) VALUES('$target','$target')");
+            $globals->xdb->execute("UPDATE aliases SET type='homonyme',expire=NOW() WHERE alias={?}", $loginbis);
+            $globals->xdb->execute("REPLACE INTO homonymes (homonyme_id,user_id) VALUES({?},{?})", $target, $target);
             $mymail = new HermesMailer();
-           $mymail->setFrom($FROM);
-           $mymail->setSubject("Mise en place du robot $loginbis@polytechnique.org");
-           $mymail->addTo("$prenom $nom <$forlife@polytechnique.org>");
-           $mymail->addCc($cc);
+            $mymail->setFrom($FROM);
+            $mymail->setSubject("Mise en place du robot $loginbis@polytechnique.org");
+            $mymail->addTo("$prenom $nom <$forlife@polytechnique.org>");
+            $mymail->addCc($cc);
             $mymail->setTxtBody(Env::get('mailbody'));
             $mymail->send();
-           $op = 'list';
-           break;
+            $op = 'list';
+            break;
     }
 }
 
 if ($op == 'list') {
-    $res = $globals->db->query("SELECT  a.alias AS homonyme,s.id AS user_id,s.alias AS forlife,
-                                       promo,prenom,nom,
-                                       IF(h.homonyme_id=s.id, a.expire, NULL) AS expire,
-                                       IF(h.homonyme_id=s.id, a.type, NULL) AS type
-                                 FROM  aliases       AS a
-                            LEFT JOIN  homonymes     AS h ON (h.homonyme_id = a.id)
-                           INNER JOIN  aliases       AS s ON (s.id = h.user_id AND s.type='a_vie')
-                           INNER JOIN  auth_user_md5 AS u ON (s.id=u.user_id)
-                                WHERE  a.type='homonyme' OR a.expire!=''
-                             ORDER BY  a.alias,promo");
+    $res = $globals->xdb->iterator(
+            "SELECT  a.alias AS homonyme,s.id AS user_id,s.alias AS forlife,
+                     promo,prenom,nom,
+                     IF(h.homonyme_id=s.id, a.expire, NULL) AS expire,
+                     IF(h.homonyme_id=s.id, a.type, NULL) AS type
+               FROM  aliases       AS a
+          LEFT JOIN  homonymes     AS h ON (h.homonyme_id = a.id)
+         INNER JOIN  aliases       AS s ON (s.id = h.user_id AND s.type='a_vie')
+         INNER JOIN  auth_user_md5 AS u ON (s.id=u.user_id)
+              WHERE  a.type='homonyme' OR a.expire!=''
+           ORDER BY  a.alias,promo");
     $hnymes = Array();
-    while ($tab = mysql_fetch_assoc($res)) {
-       $hnymes[$tab['homonyme']][] = $tab;
+    while ($tab = $res->next()) {
+        $hnymes[$tab['homonyme']][] = $tab;
     }
-    mysql_free_result($res);
-
     $page->assign_by_ref('hnymes',$hnymes);
 }