From b6f01fe4eb7fef7e9ca5f82ac0b8e257b0d519de Mon Sep 17 00:00:00 2001
From: "Pierre Habouzit (MadCoder" <pierre.habouzit@m4x.org>
Date: Sat, 25 Dec 2004 16:03:11 +0000
Subject: [PATCH] refactor

git-archimport-id: opensource@polytechnique.org--2005/platal--mainline--0.9--patch-131
---
 htdocs/epouse.php         | 20 ++++++++++----------
 htdocs/exit.php           |  9 +++++----
 htdocs/fiche.php          | 21 +++++++++------------
 htdocs/paiement/index.php |  9 ++++-----
 4 files changed, 28 insertions(+), 31 deletions(-)

diff --git a/htdocs/epouse.php b/htdocs/epouse.php
index b880415..5a71439 100644
--- a/htdocs/epouse.php
+++ b/htdocs/epouse.php
@@ -29,29 +29,29 @@ $res = $globals->db->query(
     "SELECT  u.nom,u.epouse,u.flags,e.alias
        FROM  auth_user_md5  AS u
   LEFT JOIN  aliases        AS e ON(u.user_id = e.id)
-      WHERE  user_id=".$_SESSION['uid']);
+      WHERE  user_id=".Session::getInt('uid');
 
 list($nom,$epouse_old,$flags,$alias_old) = mysql_fetch_row($res);
 $flags=new flagset($flags);
-$page->assign('is_femme',$flags->hasflag("femme"));
-$page->assign('epouse_old',$epouse_old);
-$page->assign('alias_old',$alias_old);
+$page->assign('is_femme',   $flags->hasflag("femme"));
+$page->assign('epouse_old', $epouse_old);
+$page->assign('alias_old',  $alias_old);
 
 $epouse = replace_accent(trim(clean_request('epouse'))); 
 $epouse = strtoupper($epouse);
-$page->assign('epouse_req',$epouse);
+$page->assign('epouse_req', $epouse);
 
-if (!empty($_REQUEST['submit']) && ($epouse != $epouse_old)) {
+if (Env::has('submit') && ($epouse != $epouse_old)) {
     // on vient de recevoir une requete, differente de l'ancien nom de mariage
     if ($epouse == $nom) {
-        $page->assign('same',true);
+        $page->assign('same', true);
     } else { // le nom de mariage est distinct du nom à l'X
         // on calcule l'alias pour l'afficher
-        $myepouse = new EpouseReq($_SESSION['uid'], $_SESSION['forlife'], $epouse);
+        $myepouse = new EpouseReq(Env::getInt('uid'), Env::get('forlife'), $epouse);
         $myepouse->submit();
-        $page->assign('myepouse',$myepouse);
+        $page->assign('myepouse', $myepouse);
     }
 }
 
-$page->run($flags->hasflag("femme") ? '' : 'not_femme');
+$page->run($flags->hasflag('femme') ? '' : 'not_femme');
 ?>
diff --git a/htdocs/exit.php b/htdocs/exit.php
index 58ffa1d..d43819a 100644
--- a/htdocs/exit.php
+++ b/htdocs/exit.php
@@ -22,11 +22,12 @@
 require_once("xorg.inc.php");
 new_skinned_page('index.tpl',AUTH_MDP);
 
-if (isset($_SESSION['suid'])) {
-    $suid = $_SESSION['suid'];
-    $_SESSION['log']->log("suid_stop", "{$_SESSION['forlife']} by {$suid['forlife']}");
+if (Session::has('suid')) {
+    $suid = Session::getMixed('suid');
+    $log  = Session::getMixed('log');
+    $log->log("suid_stop", Session::get('forlife') . " by " . $suid['forlife']);
     $_SESSION = $suid;
-    unset($_SESSION['suid']);
+    Session::kill('suid');
 }
 
 header("Location: login.php");
diff --git a/htdocs/fiche.php b/htdocs/fiche.php
index 865926d..237af2d 100644
--- a/htdocs/fiche.php
+++ b/htdocs/fiche.php
@@ -24,39 +24,36 @@ require_once("xorg.inc.php");
 new_simple_page('fiche.tpl',AUTH_COOKIE);
 require_once('user.func.inc.php');
 
-//$isnetscape = !empty($_SESSION['skin_compatible']);
-
-if (!isset($_REQUEST['user']) && !isset($_REQUEST['mat'])) {
+if (!Env::has('user') && !Env::has('mat')) {
     $page->kill("cette page n'existe pas");
 }
 
-if (isset($_REQUEST['user'])) {
-    $login = get_user_forlife($_REQUEST['user']);
+if (Env::has('user')) {
+    $login = get_user_forlife(Env::get('user'));
     if ($login === false) {
         $page->kill("");
     }
 }
 
-if (isset($_REQUEST['mat'])) {
+if (Enf::has('mat')) {
     $res = $globals->db->query("SELECT  alias 
                                   FROM  aliases       AS a
                             INNER JOIN  auth_user_md5 AS u ON (a.id=u.user_id AND a.type='a_vie')
-                                 WHERE  matricule='{$_REQUEST['mat']}'");
+                                 WHERE  matricule=".Env::getInt('mat'));
     if (!(list($login) = mysql_fetch_row($res))) {
         $page->kill("cette page n'existe pas");
     }
     mysql_free_result($res);
 }
 
-$new = (isset($_REQUEST["modif"]) && $_REQUEST["modif"]=="new");
-$user = get_user_details($login, $_SESSION['uid']);
-
-$title = $user['prenom'] . ' ' .  empty($user['epouse']) ? $user['nom'] : $user['epouse'];
+$new   = Env::get('modif') == 'new';
+$user  = get_user_details($login, Session::getInt('uid'));
+$title = $user['prenom'] . ' ' . empty($user['epouse']) ? $user['nom'] : $user['epouse'];
 $page->assign('xorg_title', $title);
 
 // photo
 
-$photo="getphoto.php?x=".$user['forlife'].($new ? '&amp;modif=new' : '');
+$photo = 'getphoto.php?x='.$user['forlife'].($new ? '&amp;modif=new' : '');
 
 if(!isset($user['y']) and !isset($user['x'])) {
     list($user['x'], $user['y']) = getimagesize("images/none.png");
diff --git a/htdocs/paiement/index.php b/htdocs/paiement/index.php
index c2d7136..72e96e6 100644
--- a/htdocs/paiement/index.php
+++ b/htdocs/paiement/index.php
@@ -25,16 +25,15 @@ require_once('profil.func.inc.php');
 require_once('money.inc.php');
 
 // initialisation
-$op = isset($_REQUEST['op']) ? $_REQUEST['op'] : 'select';
-
-$meth = new PayMethod(isset($_REQUEST['methode']) ? $_REQUEST['methode'] : -1);
-$pay  = new Payment(isset($_REQUEST['ref']) ? $_REQUEST['ref'] : -1);
+$op   = Env::get('op', 'select');
+$meth = new PayMethod(Env::getInt('methode', -1));
+$pay  = new Payment(Env::getInt('ref', -1));
 
 if($pay->flags->hasflag('old')){
     $page->trig("La transaction selectionnée est périmée.");
     $pay = new Payment();
 }
-$val  = (($op=="submit") && isset($_REQUEST['montant'])) ? $_REQUEST['montant'] : $pay->montant_def;
+$val  = ($op=="submit" && Env::has('montant')) ? Env::get('montant') : $pay->montant_def;
 
 if (($e = $pay->check($val)) !== true) {
     $page->trig($e);
-- 
2.1.4