carnet refactor

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

diff --git a/htdocs/carnet/mescontacts.php b/htdocs/carnet/mescontacts.php
index 98a0133..96de517 100644 (file)
--- a/htdocs/carnet/mescontacts.php
+++ b/htdocs/carnet/mescontacts.php
@@ -22,12 +22,14 @@
 require_once("xorg.inc.php");
 new_skinned_page("carnet/mescontacts.tpl",AUTH_COOKIE);
 require_once("applis.func.inc.php");
+        
+$uid  = Session::getInt('uid');
+$user = Env::get('user');
 
-if (isset($_REQUEST['action'])) {
-    if($_REQUEST['action']=='retirer') {
-       $user = $_REQUEST['user'];
+switch (Env::get('action')) {
+    case 'retirer':
        if (preg_match('/^\d+$/', $user)) {
-           if ($globals->db->query("DELETE FROM contacts WHERE uid = '{$_SESSION['uid']}' AND contact='{$user}'"))
+           if ($globals->db->query("DELETE FROM contacts WHERE uid = $uid' AND contact='{$user}'"))
             {
                $page->trig("Contact retiré !");
             }
@@ -36,16 +38,18 @@ if (isset($_REQUEST['action'])) {
                         "DELETE FROM  contacts
                                USING  contacts AS c
                           INNER JOIN  aliases  AS a ON (c.contact=a.id and a.type!='homonyme')
-                               WHERE  c.uid = '{$_SESSION['uid']}' AND a.alias='$user'"))
+                               WHERE  c.uid = $uid AND a.alias='$user'"))
             {
                $page->trig("Contact retiré !");
             }
        }
-    } elseif ($_REQUEST["action"]=="ajouter") {
+        break;
+
+    case "ajouter":
         require_once('user.func.inc.php');
-        if (($login = get_user_login($_REQUEST['user'])) !== false) {
+        if (($login = get_user_login($user) !== false) {
             if ($globals->db->query("INSERT INTO  contacts (uid, contact)
-                                          SELECT  '{$_SESSION['uid']}', id
+                                          SELECT  $uid, id
                                             FROM  aliases
                                            WHERE  alias='$login'"))
             {
@@ -54,14 +58,13 @@ if (isset($_REQUEST['action'])) {
                 $page->trig('Contact déjà dans la liste !');
             }
         }
-    }
 }
 
-if(isset($_GET['trombi'])) {
+if(Get::has('trombi')) {
     require_once('trombi.inc.php');
     function getList($offset,$limit) {
        global $globals;
-       $res = $globals->db->query("SELECT COUNT(*) FROM contacts WHERE uid = {$_SESSION['uid']}");
+       $res = $globals->db->query("SELECT COUNT(*) FROM contacts WHERE uid = $uid");
        list($total) = mysql_fetch_row($res);
        mysql_free_result($res);
 
@@ -70,7 +73,7 @@ if(isset($_GET['trombi'])) {
                  FROM  contacts       AS c
            INNER JOIN  auth_user_md5  AS u   ON (u.user_id = c.contact)
            INNER JOIN  aliases        AS a   ON (u.user_id = a.id AND a.type='a_vie')
-                WHERE  c.uid = {$_SESSION['uid']}
+                WHERE  c.uid = $uid
              ORDER BY  nom
                 LIMIT  ".$offset*$limit.",$limit");
        $list = Array();
@@ -109,7 +112,7 @@ if(isset($_GET['trombi'])) {
            LEFT  JOIN adresses       AS adr ON (a.user_id = adr.uid AND FIND_IN_SET('active', adr.statut))
            LEFT  JOIN geoloc_pays    AS gp  ON (adr.pays = gp.a2)
            LEFT  JOIN geoloc_region  AS gr  ON (adr.pays = gr.a2 AND adr.region = gr.region)
-           WHERE c.uid = {$_SESSION['uid']}
+           WHERE c.uid = $uid
            ORDER BY sortkey, a.prenom";
     $page->mysql_assign($sql,'contacts','nb_contacts');
 }

diff --git a/htdocs/carnet/mescontacts_pdf.php b/htdocs/carnet/mescontacts_pdf.php
index b462754..e4bf6e3 100644 (file)
--- a/htdocs/carnet/mescontacts_pdf.php
+++ b/htdocs/carnet/mescontacts_pdf.php
@@ -28,9 +28,9 @@ $sql = "SELECT  a.*,c.*,e.alias as epouse
          FROM  auth_user_md5 AS a
     INNER JOIN  contacts      AS c ON ( a.user_id = c.contact )
     LEFT  JOIN  aliases       AS e ON ( a.user_id = e.id and FIND_IN_SET('epouse',e.flags) )
-         WHERE  c.uid = {$_SESSION['uid']}";
+         WHERE  c.uid = ".Session::getInt('uid']);
 // choix de l'ordre des réponses (par promo ou par noms)
-if(isset($_GET['order']) && $_GET['order']=="promo") {
+if (Get::get('order') == "promo") {
     $sql .= " ORDER BY  a.promo, a.nom, a.prenom";
 } else {
     $sql .= " ORDER BY  a.nom, a.prenom, a.promo";

diff --git a/htdocs/carnet/notifs.php b/htdocs/carnet/notifs.php
index eac57a2..98442fe 100644 (file)
--- a/htdocs/carnet/notifs.php
+++ b/htdocs/carnet/notifs.php
@@ -23,18 +23,18 @@ require_once("xorg.inc.php");
 new_skinned_page('carnet/notifs.tpl', AUTH_COOKIE);
 require_once('notifs.inc.php');
 
-$watch = new Watch($_SESSION['uid']);
+$watch = new Watch(Session::getInt('uid'));
 
-if(isset($_REQUEST['promo'])) {
-    if(preg_match('!^ *(\d{4}) *$!', $_REQUEST['promo'], $matches)) {
+if(Env::has('promo')) {
+    if(preg_match('!^ *(\d{4}) *$!', Env::get('promo'), $matches)) {
        $p = intval($matches[1]);
        if($p<1900 || $p>2100) {
             $page->trig("la promo entrée est invalide");
        } else {
-           if(isset($_REQUEST['add_promo'])) $watch->_promos->add($p);
-           if(isset($_REQUEST['del_promo'])) $watch->_promos->del($p);
+           if (Env::has('add_promo')) $watch->_promos->add($p);
+           if (Env::has('del_promo')) $watch->_promos->del($p);
        }
-    } elseif (preg_match('!^ *(\d{4}) *- *(\d{4}) *$!', $_REQUEST['promo'], $matches)) {
+    } elseif (preg_match('!^ *(\d{4}) *- *(\d{4}) *$!', Env::get('promo'), $matches)) {
        $p1 = intval($matches[1]);
        $p2 = intval($matches[2]);
        if($p1<1900 || $p1>2100) {
@@ -42,20 +42,20 @@ if(isset($_REQUEST['promo'])) {
        } elseif($p2<1900 || $p2>2100) {
             $page->trig('la seconde promo de la plage entrée est invalide');
        } else {
-           if(isset($_REQUEST['add_promo'])) $watch->_promos->addRange($p1,$p2);
-           if(isset($_REQUEST['del_promo'])) $watch->_promos->delRange($p1,$p2);
+           if (Env::has('add_promo')) $watch->_promos->addRange($p1,$p2);
+           if (Env::has('del_promo')) $watch->_promos->delRange($p1,$p2);
        }
     } else {
         $page->trig("La promo (ou la plage de promo) entrée est dans un format incorrect.");
     }
 }
 
-if(isset($_REQUEST['del_nonins'])) $watch->_nonins->del($_REQUEST['del_nonins']);
-if(isset($_REQUEST['add_nonins'])) $watch->_nonins->add($_REQUEST['add_nonins']);
-if(isset($_REQUEST['subs'])) $watch->_subs->update('sub');
-if(isset($_REQUEST['flags'])) {
-    $watch->watch_contacts = !empty($_REQUEST['contacts']);
-    $watch->watch_mail     = !empty($_REQUEST['mail']);
+if (Env::has('del_nonins')) $watch->_nonins->del(Env::get('del_nonins'));
+if (Env::has('add_nonins')) $watch->_nonins->add(Env::get('add_nonins'));
+if (Env::has('subs'))       $watch->_subs->update('sub');
+if (Env::has('flags')) {
+    $watch->watch_contacts = Env::getBool('contacts');
+    $watch->watch_mail     = Env::getBool('mail');
     $watch->saveFlags();
 }
 

diff --git a/htdocs/carnet/panel.php b/htdocs/carnet/panel.php
index b3461e2..3b91262 100644 (file)
--- a/htdocs/carnet/panel.php
+++ b/htdocs/carnet/panel.php
@@ -23,13 +23,13 @@ require_once("xorg.inc.php");
 new_skinned_page('carnet/panel.tpl', AUTH_COOKIE);
 require_once('notifs.inc.php');
 
-if(isset($_GET['read'])) {
-    $_SESSION['watch_last'] = $_GET['read'];
+if(Get::has('read')) {
+    $_SESSION['watch_last'] = Get::get('read');
     header("Location: panel.php");
 }
 
 $page->assign('now',date('YmdHis'));
-$notifs = new Notifs($_SESSION['uid'], true);
+$notifs = new Notifs(Session::getInt('uid'), true);
 
 $page->assign_by_ref('notifs', $notifs);