some more refactor

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

diff --git a/htdocs/advanced_search.php b/htdocs/advanced_search.php
index c7d22eb..a590d1d 100644 (file)
--- a/htdocs/advanced_search.php
+++ b/htdocs/advanced_search.php
@@ -42,18 +42,18 @@ function form_prepare()
     $page->mysql_assign('SELECT id,text FROM applis_def ORDER BY text',       'choix_schools');
     $page->mysql_assign('SELECT id,label FROM emploi_secteur ORDER BY label', 'choix_secteurs');
 
-    if (empty($_REQUEST['school'])) {
-        $sql = 'DESCRIBE applis_def type';
+    if (Env::has('school')) {
+        $sql = 'SELECT type FROM applis_def WHERE id='.Env::getInt('school');
     } else {
-        $sql = 'SELECT type FROM applis_def WHERE id='.$_REQUEST['school'];
+        $sql = 'DESCRIBE applis_def type';
     }
     $res = $globals->db->query($sql);
     $row = mysql_fetch_row($res);
-    if (empty($_REQUEST['school'])) {
+    if (Env::has('school')) {
+        $types = $row[0];
+    } else {
         $types = explode('(',$row[1]);
         $types = str_replace("'","",substr($types[1],0,-1));
-    } else {
-        $types = $row[0];
     }
     mysql_free_result($res);
     $page->assign('choix_diplomas', explode(',',$types));
@@ -61,11 +61,11 @@ function form_prepare()
 
 // }}}
 
-if (!array_key_exists('rechercher', $_REQUEST)) {
+if (!Env::has('rechercher')) {
     form_prepare();
 } else {
 
-    if ($with_soundex = !empty($_REQUEST['with_soundex'])) {
+    if ($with_soundex = Env::has('with_soundex')) {
         $nameField      = new RefWithSoundexSField('name',array('rn.nom1_soundex','rn.nom2_soundex','rn.nom3_soundex'),'recherche_soundex','rn','u.matricule = rn.matricule');
         $firstnameField = new RefWithSoundexSField('firstname',array('rp.prenom1_soundex','rp.prenom2_soundex'),'recherche_soundex','rp','u.matricule = rp.matricule');
     } else {
@@ -118,13 +118,13 @@ if (!array_key_exists('rechercher', $_REQUEST)) {
                        w.ni_id AS watch
                  FROM  auth_user_md5  AS u 
             '.$fields->get_select_statement().'
-            '.(empty($_REQUEST['only_referent']) ? '' : ' INNER JOIN mentor AS m ON (m.uid = u.user_id)').'
+            '.(Env::has('only_referent') ? '' : ' INNER JOIN mentor AS m ON (m.uid = u.user_id)').'
             LEFT JOIN  aliases        AS a ON (u.user_id = a.id AND a.type="a_vie")
-            LEFT JOIN  contacts       AS c ON (c.uid='.((array_key_exists('uid',$_SESSION))?$_SESSION['uid']:0).' AND c.contact=u.user_id)
-            LEFT JOIN  watch_nonins   AS w ON (w.ni_id=u.user_id AND w.uid='.((array_key_exists('uid',$_SESSION))?$_SESSION['uid']:0).')
+            LEFT JOIN  contacts       AS c ON (c.uid='.Session::getInt('uid').' AND c.contact=u.user_id)
+            LEFT JOIN  watch_nonins   AS w ON (w.ni_id=u.user_id AND w.uid='.Session::getInt('uid').')
             '.$globals->search->result_where_statement.'
                 '.(empty($where) ? '' : "WHERE  $where").'
-             ORDER BY  '.(logged() && !empty($_REQUEST['mod_date_sort']) ? 'date DESC,' :'')
+             ORDER BY  '.(logged() && Env::has('mod_date_sort') ? 'date DESC,' :'')
                        .implode(',',array_filter(array($fields->get_order_statement(), 'promo DESC, NomSortKey, prenom'))).'
                 LIMIT  '.$offset->value.','.$globals->search->per_page;
 
@@ -133,7 +133,7 @@ if (!array_key_exists('rechercher', $_REQUEST)) {
     $nbpages = ($nb_tot - 1)/$globals->search->per_page;
 
     $url_ext = Array(
-        'mod_date_sort' => !empty($_REQUEST['mod_date_sort']),
+        'mod_date_sort' => Env::has('mod_date_sort'),
         'rechercher'    => true,
         'with_soundex'  => $with_soundex
     );

diff --git a/htdocs/antispam.php b/htdocs/antispam.php
index cfb6816..b835c73 100644 (file)
--- a/htdocs/antispam.php
+++ b/htdocs/antispam.php
@@ -23,10 +23,10 @@ require_once("xorg.inc.php");
 new_skinned_page('antispam.tpl', AUTH_MDP);
 require_once("emails.inc.php");
 
-$bogo = new Bogo($_SESSION['uid']);
+$bogo = new Bogo(Session::getInt('uid'));
 
-if (isset($_REQUEST['filtre']) and isset($_REQUEST['statut_filtre'])) {
-    $bogo->change($_SESSION['uid'], intval($_REQUEST['statut_filtre']));
+if (Env::has('filtre') and Env::has('statut_filtre')) {
+    $bogo->change(Session::getInt('uid'), Env::getInt('statut_filtre'));
 }
 
 $page->assign('filtre',$bogo->level());

diff --git a/htdocs/cookie_off.php b/htdocs/cookie_off.php
index 5b48d5c..772e366 100644 (file)
--- a/htdocs/cookie_off.php
+++ b/htdocs/cookie_off.php
@@ -33,5 +33,5 @@ if(!identified()) {
     header("Location: index.php");
 }
 
-$page->run();
+header("Location: preferences.php");
 ?>

diff --git a/htdocs/cookie_on.php b/htdocs/cookie_on.php
index fc331f0..ce3cf1f 100644 (file)
--- a/htdocs/cookie_on.php
+++ b/htdocs/cookie_on.php
@@ -22,11 +22,7 @@
 require_once("xorg.inc.php");
 new_skinned_page('cookie_on.tpl', AUTH_MDP);
 
-$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);
-
+$cookie = md5(Session::get('password'));
 setcookie('ORGaccess',$cookie,(time()+25920000),'/','',0);
 $_SESSION['log']->log("cookie_on");
 

diff --git a/htdocs/deconnexion.php b/htdocs/deconnexion.php
index 1d8e83a..5f95d22 100644 (file)
--- a/htdocs/deconnexion.php
+++ b/htdocs/deconnexion.php
@@ -19,19 +19,19 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************/
 
-require_once("xorg.inc.php");
+require_once('xorg.inc.php');
 
 if (isset($_SESSION['suid'])) { require_once('./exit.php'); }
 
 if (isset($_SESSION['log'])) {
-    $ref = isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : "";
-    $_SESSION['log']->log("deconnexion",$ref);
+    $ref = isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '';
+    $_SESSION['log']->log('deconnexion',$ref);
 }
 
 session_destroy();
 $_SESSION = array();
 if(isset($_COOKIE['ORGaccess']) && isset($_COOKIE['ORGuid'])) {
-    header("Location: login.php");
+    header('Location: login.php');
 }
 
 new_skinned_page('deconnexion.tpl', AUTH_PUBLIC);

diff --git a/htdocs/login.php b/htdocs/login.php
index 26852c2..e892b3c 100644 (file)
--- a/htdocs/login.php
+++ b/htdocs/login.php
@@ -19,10 +19,10 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************/
 
-require_once("xorg.inc.php");
+require_once('xorg.inc.php');
 new_skinned_page('login.tpl', AUTH_COOKIE);
 
-$param=$globals->db->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::getInt('uid'));
 list($date,$naissance) = mysql_fetch_row($param);
 mysql_free_result($param);
 
@@ -34,7 +34,7 @@ if ($naissance==0 || $naissance=='0000-00-00')  {
 
 // incitation à mettre à jour la fiche
 
-$res = $globals->db->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::getInt('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;
@@ -43,7 +43,7 @@ if(( (time() - $date_maj) > 60 * 60 * 24 * 400)) { // si fiche date de + de 400j
 
 // incitation à mettre une photo
 
-$res = $globals->db->query("SELECT 1 FROM photo WHERE uid=".$_SESSION["uid"]);
+$res = $globals->db->query('SELECT 1 FROM photo WHERE uid='.Session::getInt('uid'));
 if (mysql_num_rows($res) == 0)
     $page->assign('photo_incitation', true);
 mysql_free_result($res);
@@ -68,13 +68,14 @@ $page->assign_by_ref('publicite', $publicite);
 // affichage des evenements
 // annonces promos triées par présence d'une limite sur les promos
 // puis par dates croissantes d'expiration
+$promo = Session::getInt('promo');
 $sql = "SELECT  e.id,e.titre,e.texte,a.user_id,a.nom,a.prenom,a.promo,l.alias AS forlife
           FROM  evenements    AS e
     INNER JOIN  auth_user_md5 AS a ON e.user_id=a.user_id
     INNER JOIN  aliases       AS l ON ( a.user_id=l.id AND l.type='a_vie' )
          WHERE  FIND_IN_SET(e.flags, 'valide') AND peremption >= NOW()
-               AND (e.promo_min = 0 || e.promo_min <= {$_SESSION['promo']})
-               AND (e.promo_max = 0 || e.promo_max >= {$_SESSION['promo']})
+               AND (e.promo_min = 0 || e.promo_min <= $promo)
+               AND (e.promo_max = 0 || e.promo_max >= $promo)
       ORDER BY  (e.promo_min != 0 AND  e.promo_max != 0) DESC,  e.peremption";
 $page->mysql_assign($sql, 'evenement');
 

diff --git a/htdocs/motdepassemd5.php b/htdocs/motdepassemd5.php
index 4d66cd6..d530391 100644 (file)
--- a/htdocs/motdepassemd5.php
+++ b/htdocs/motdepassemd5.php
@@ -19,14 +19,14 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************/
 
-require_once("xorg.inc.php");
+require_once('xorg.inc.php');
 
-if (!empty($_POST['response2']))  {             // la variable $response existe-t-elle ?
+if (Env::has('response2'))  {             // la variable $response existe-t-elle ?
     // OUI, alors changeons le mot de passe
     $password = $_POST['response2'];
-    $sql = "UPDATE auth_user_md5 SET password='$password' WHERE user_id=".$_SESSION['uid'];
+    $sql      = "UPDATE auth_user_md5 SET password='$password' WHERE user_id=".Session::getInt('uid');
     $globals->db->query($sql);
-    $_SESSION['log']->log("passwd","");
+    $_SESSION['log']->log('passwd', '');
     new_skinned_page('motdepassemd5.success.tpl', AUTH_MDP);
     $page->run();
 }

diff --git a/htdocs/preferences.php b/htdocs/preferences.php
index 403409a..104542c 100644 (file)
--- a/htdocs/preferences.php
+++ b/htdocs/preferences.php
@@ -22,7 +22,7 @@
 require_once("xorg.inc.php");
 new_skinned_page('preferences.tpl', AUTH_COOKIE);
 
-$has_cookie = (isset($_COOKIE['ORGaccess']) ? 'cookie' : '');
+$has_cookie = (Cookie::has('ORGaccess') ? 'cookie' : '');
 $page->assign('has_cookie', $has_cookie);
 
 $page->run($has_cookie);

diff --git a/htdocs/rss.php b/htdocs/rss.php
index 3098979..d918f7b 100644 (file)
--- a/htdocs/rss.php
+++ b/htdocs/rss.php
@@ -19,19 +19,20 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************/
 
-require_once("xorg.inc.php");
+require_once('xorg.inc.php');
 new_nonhtml_page('rss.tpl', AUTH_PUBLIC);
 
-$requete="SELECT e.id,e.titre,e.texte FROM evenements AS e WHERE FIND_IN_SET(flags, 'valide') AND peremption >= NOW()";
+$requete='SELECT e.id,e.titre,e.texte FROM evenements AS e WHERE FIND_IN_SET(flags, 'valide') AND peremption >= NOW()';
 
-if (isset($_REQUEST["promo"])) {
-    $requete.=" AND (e.promo_min = 0 || e.promo_min <= {$_REQUEST['promo']}) AND (e.promo_max = 0 || e.promo_max >= {$_REQUEST['promo']})";
-    $page->assign('promo',$_REQUEST["promo"]);
+if (Env::has('promo')) {
+    $promo    = Env::getInt('promo');
+    $requete .= " AND (e.promo_min = 0 || e.promo_min <= $promo) AND (e.promo_max = 0 || e.promo_max >= $promo)";
+    $page->assign('promo', $promo);
 }
 
-$requete.=" ORDER BY (e.promo_min != 0 AND e.promo_max != 0) DESC,  e.peremption";
-$page->mysql_assign($requete,'rss');
+$requete.=' ORDER BY (e.promo_min != 0 AND e.promo_max != 0) DESC,  e.peremption';
+$page->mysql_assign($requete, 'rss');
 
-header("Content-Type: text/xml");
+header('Content-Type: text/xml');
 $page->run();
 ?> 

diff --git a/htdocs/search.php b/htdocs/search.php
index c3fd7e5..67fba51 100644 (file)
--- a/htdocs/search.php
+++ b/htdocs/search.php
@@ -30,7 +30,7 @@ if (logged()) {
 require_once("applis.func.inc.php");
 require_once("geoloc.inc.php");
 
-if (isset($_REQUEST['quick'])) {
+if (Env::has('quick')) {
     $page->assign('formulaire', 0);
 
     $qSearch = new QuickSearch('quick');
@@ -50,12 +50,12 @@ if (isset($_REQUEST['quick'])) {
                        '.$qSearch->get_mark_statement().'
                  FROM  auth_user_md5  AS u
             LEFT JOIN  aliases        AS a   ON (u.user_id = a.id AND a.type="a_vie")
-            LEFT JOIN  contacts       AS c   ON (c.uid='.((array_key_exists('uid',$_SESSION))?$_SESSION['uid']:0).' AND c.contact=u.user_id)
-            LEFT JOIN  watch_nonins   AS w   ON (w.ni_id=u.user_id AND w.uid='.((array_key_exists('uid',$_SESSION))?$_SESSION['uid']:0).')
+            LEFT JOIN  contacts       AS c   ON (c.uid='.Session::getInt('uid').' AND c.contact=u.user_id)
+            LEFT JOIN  watch_nonins   AS w   ON (w.ni_id=u.user_id AND w.uid='.Session::getInt('uid').')
             '.$globals->search->result_where_statement.'
                 WHERE  '.$fields->get_where_statement().'
                HAVING  mark>=10
-             ORDER BY  '.(logged() && !empty($_REQUEST['mod_date_sort']) ? 'date DESC,' :'')
+             ORDER BY  '.(logged() && Env::has('mod_date_sort') ? 'date DESC,' :'')
                        .implode(',',array_filter(array($fields->get_order_statement(), 'u.promo DESC, NomSortKey, prenom'))).'
                 LIMIT  '.$offset->value.','.$globals->search->per_page;
 
@@ -64,7 +64,7 @@ if (isset($_REQUEST['quick'])) {
     $nbpages  = ($nb_total-1)/$globals->search->per_page;
 
     $url_ext = Array(
-        'mod_date_sort' => !empty($_REQUEST['mod_date_sort'])
+        'mod_date_sort' => Env::has('mod_date_sort')
     );
     $page->assign('offset',   $offset->value);
     $page->assign('offsets',  range(0, $nbpages));

diff --git a/htdocs/skins.php b/htdocs/skins.php
index 187067d..3c61f9f 100644 (file)
--- a/htdocs/skins.php
+++ b/htdocs/skins.php
@@ -19,16 +19,16 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************/
 
-require_once("xorg.inc.php");
+require_once('xorg.inc.php');
 if (!$globals->skin->enable) {
-    header("Location: index.php");
+    header('Location: index.php');
 }
 new_skinned_page('skins.tpl', AUTH_COOKIE);
 
-if (isset($_REQUEST['newskin']))  {  // formulaire soumis, traitons les données envoyées
-    $globals->db->query("UPDATE auth_user_quick
-                SET skin={$_REQUEST['newskin']}
-                WHERE user_id={$_SESSION['uid']}");
+if (Env::has('newskin'))  {  // formulaire soumis, traitons les données envoyées
+    $globals->db->query('UPDATE auth_user_quick
+                SET skin='..Env::getInt('newskin').'
+                WHERE user_id='..Session::getInt('uid'));
     set_skin();
 }
 

diff --git a/htdocs/tmpPWD.php b/htdocs/tmpPWD.php
index 5e86ae8..bc5fb7c 100644 (file)
--- a/htdocs/tmpPWD.php
+++ b/htdocs/tmpPWD.php
@@ -24,20 +24,20 @@ require_once("xorg.inc.php");
 $sql = "DELETE FROM perte_pass WHERE DATE_SUB(NOW(), INTERVAL 380 MINUTE) > created";
 $globals->db->query($sql);
 
-$certificat = isset($_REQUEST['certificat']) ? $_REQUEST['certificat'] : "";
-$sql = "SELECT uid FROM perte_pass WHERE certificat='$certificat'";
-$result = $globals->db->query($sql);
+$certificat = Env::get('certificat');
+$sql        = "SELECT uid FROM perte_pass WHERE certificat='$certificat'";
+$result     = $globals->db->query($sql);
 
 if ($ligne = mysql_fetch_array($result))  {
     $uid=$ligne["uid"];
-    if (!empty($_POST['response2']))  {             // la variable $response existe-t-elle ?
+    if (Post::has('response2'))  {             // la variable $response existe-t-elle ?
     // OUI, alors changeons le mot de passe
-        $password = $_POST['response2'];
-        $sql = "UPDATE auth_user_md5 SET password='$password' WHERE user_id='$uid' AND perms IN('admin','user')";
+        $password = Post::get('response2');
+        $sql      = "UPDATE auth_user_md5 SET password='$password' WHERE user_id='$uid' AND perms IN('admin','user')";
         $globals->db->query($sql);
-        $logger = new DiogenesCoreLogger($uid);
+        $logger   = new DiogenesCoreLogger($uid);
         $logger->log("passwd","");
-        $sql = "DELETE FROM perte_pass WHERE certificat='$certificat'";
+        $sql      = "DELETE FROM perte_pass WHERE certificat='$certificat'";
         $globals->db->query($sql);
         new_skinned_page('tmpPWD.success.tpl', AUTH_PUBLIC);
         $page->run();

diff --git a/htdocs/trombino.php b/htdocs/trombino.php
index fa753a9..56ddffa 100644 (file)
--- a/htdocs/trombino.php
+++ b/htdocs/trombino.php
@@ -19,47 +19,47 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************/
 
-require_once("xorg.inc.php");
+require_once('xorg.inc.php');
 new_skinned_page('trombino.tpl', AUTH_MDP);
 
-require_once("validations.inc.php");
+require_once('validations.inc.php');
 
-if (isset($_REQUEST["ordi"]) and
-        isset($_FILES["userfile"]) and isset($_FILES["userfile"]["tmp_name"])) {
+if (Env::has('ordi') and
+        isset($_FILES['userfile']) and isset($_FILES['userfile']['tmp_name'])) {
     //Fichier en local
-    $myphoto = new PhotoReq($_SESSION['uid'], $_FILES["userfile"]["tmp_name"]);
+    $myphoto = new PhotoReq(Session::getInt('uid'), $_FILES['userfile']['tmp_name']);
     $myphoto->submit();
-} elseif (isset($_REQUEST["web"]) and isset($_REQUEST["photo"])) {
+} elseif (Env::has('web') and Env::has('photo')) {
     // net
-    $fp = fopen($_REQUEST["photo"], 'r');
+    $fp = fopen(Env::get('photo'), 'r');
     if (!$fp) {
-        $page->trig("Fichier inexistant");
+        $page->trig('Fichier inexistant');
     } else {
         $attach = fread($fp, 35000);
         fclose($fp);
         $file = tempnam('/tmp','photo_');
-        $fp = fopen($file,'w');
+        $fp   = fopen($file,'w');
         fwrite($fp, $attach);
         fclose($fp);
 
-        $myphoto = new PhotoReq($_SESSION['uid'], $file);
+        $myphoto = new PhotoReq(Session::getInt('uid'), $file);
         $myphoto->submit();
     }
-} elseif (isset($_REQUEST["trombi"])) {
+} elseif (Env::has('trombi')) {
     // Fichier à récupérer dans les archives trombi + commit immédiat
-    $file = "/home/web/trombino/photos".$_SESSION["promo"]."/".$_SESSION["forlife"].".jpg";
-    $myphoto = new PhotoReq($_SESSION['uid'], $file);
+    $file = '/home/web/trombino/photos'.Session::get('promo').'/'.Session::get('forlife').'.jpg';
+    $myphoto = new PhotoReq(Session::getInt('uid'), $file);
     if($myphoto){// There was no errors, we can go on
         $myphoto->commit();
         $myphoto->clean();
     }
-} elseif (isset($_REQUEST["suppr"])) {
+} elseif (Env::get('suppr')) {
     // effacement de la photo
-    $globals->db->query("DELETE FROM photo WHERE uid = ".$_SESSION["uid"]);
-    $globals->db->query("DELETE FROM requests WHERE user_id = ".$_SESSION["uid"]." AND type='photo'");
+    $globals->db->query('DELETE FROM photo WHERE uid = '.Session::getInt('uid'));
+    $globals->db->query('DELETE FROM requests WHERE user_id = '.Session::getInt('uid').' AND type="photo"');
 }
 
-$sql = $globals->db->query("SELECT * FROM requests WHERE user_id='{$_SESSION['uid']}' AND type='photo'");
+$sql = $globals->db->query('SELECT * FROM requests WHERE user_id='.Session::getInt('uid').' AND type="photo"');
 $page->assign('submited', mysql_num_rows($sql) > 0);
 
 $page->run();

diff --git a/htdocs/trombipromo.php b/htdocs/trombipromo.php
index 0cc4562..ef84632 100644 (file)
--- a/htdocs/trombipromo.php
+++ b/htdocs/trombipromo.php
@@ -26,8 +26,8 @@ require_once("trombi.inc.php");
 function getList($offset,$limit) {
     global $globals;
 
-    $xpromo = intval($_REQUEST['xpromo']);
-    $where = ( $xpromo>0 ? "WHERE promo='$xpromo'" : "" );
+    $xpromo = Env::getInt('xpromo');
+    $where  = ( $xpromo>0 ? "WHERE promo='$xpromo'" : "" );
 
     $res = $globals->db->query("SELECT  COUNT(*)
                                  FROM  auth_user_md5 AS u
@@ -51,10 +51,10 @@ function getList($offset,$limit) {
     return Array($pnb, $list);
 }
 
-if(isset($_REQUEST['xpromo'])) {
-    $xpromo = intval($_REQUEST['xpromo']);
+if (Env::has('xpromo')) {
+    $xpromo = Env::getInt('xpromo');
 
-    if ( $xpromo<1900 || $xpromo>date('Y') || ($xpromo == -1 && $_SESSION['perms']!="admin") ) {
+    if ( $xpromo<1900 || $xpromo>date('Y') || ($xpromo == -1 && Session::get('perms')!="admin") ) {
        $page->trig("Promotion incorrecte (saisir au format YYYY). Recommence.");
         $page->assign('error', true);
     } else {

diff --git a/htdocs/vcard.php b/htdocs/vcard.php
index e9bd157..6e2997b 100644 (file)
--- a/htdocs/vcard.php
+++ b/htdocs/vcard.php
@@ -37,7 +37,7 @@ function format_adr($params, &$smarty)
 $page->register_modifier('qp_enc', 'quoted_printable_encode');
 $page->register_function('format_adr', 'format_adr');
 
-$login = get_user_forlife($_REQUEST['x']);
+$login = get_user_forlife(Env::get('x'));
 $user  = get_user_details($login);
 $page->assign_by_ref('vcard', $user);
 

diff --git a/htdocs/webredirect.php b/htdocs/webredirect.php
index 0af0cbf..1b99b76 100644 (file)
--- a/htdocs/webredirect.php
+++ b/htdocs/webredirect.php
@@ -22,21 +22,24 @@
 require_once("xorg.inc.php");
 new_skinned_page('webredirect.tpl', AUTH_MDP);
 
-if (isset($_REQUEST['submit']) and ($_REQUEST['submit'] == "Valider" or $_REQUEST['submit'] == "Modifier") and isset($_REQUEST['url'])) {
+$log =& Session::getMixed('log');
+$url = Env::get('url');
+
+if ((Env::get('submit') == 'Valider' or Env::get('submit') == 'Modifier') and Env::has('url')) {
     // on change la redirection (attention à http://)
-    $globals->db->query("update auth_user_quick set redirecturl = '{$_REQUEST['url']}' where user_id = '{$_SESSION['uid']}'");
+    $globals->db->query("update auth_user_quick set redirecturl = '$url' where user_id = ".Session::getInt('uid'));
     if (mysql_errno() == 0) {
-        $_SESSION['log']->log("carva_add","http://".$_REQUEST['url']);
-        $page->trig("Redirection activée vers <a href='http://{$_REQUEST['url']}'>{$_REQUEST['url']}</a>");
+        $log->log('carva_add', 'http://'.Env::get('url'));
+        $page->trig("Redirection activée vers <a href='http://$url'>$url</a>");
     } else {
         $page->trig('Erreur de mise à jour');
     }
-} elseif (isset($_REQUEST['submit']) and $_REQUEST['submit'] == "Supprimer") {
+} elseif (Env::get('submit') == "Supprimer") {
     // on supprime la redirection
-    $globals->db->query("update auth_user_quick set redirecturl = '' where user_id = {$_SESSION['uid']}");
+    $globals->db->query("update auth_user_quick set redirecturl = '' where user_id = ".Session::getInt('uid'));
     if (mysql_errno() == 0) {
-        $_SESSION['log']->log("carva_del",$_REQUEST['url']);
-        $_POST['url'] = '';
+        $log->log("carva_del", $url);
+        Post::kil('url');
         $page->trig('Redirection supprimée');
     } else {
         $page->trig('Erreur de suppression');
@@ -44,7 +47,7 @@ if (isset($_REQUEST['submit']) and ($_REQUEST['submit'] == "Valider" or $_REQUES
 }
 
 
-$result = $globals->db->query("select redirecturl from auth_user_quick where user_id={$_SESSION['uid']}");
+$result      = $globals->db->query("select redirecturl from auth_user_quick where user_id = ".Session::getInt('uid'));
 list($carva) = mysql_fetch_row($result);
 mysql_free_result($result);
 $page->assign('carva', $carva);