From fa2bd7352e191cdb16f10c40968e92589694cf4b Mon Sep 17 00:00:00 2001 From: "Pierre Habouzit (MadCoder" Date: Sat, 25 Dec 2004 20:28:29 +0000 Subject: [PATCH] refactor git-archimport-id: opensource@polytechnique.org--2005/platal--mainline--0.9--patch-135 --- htdocs/motdepassemd5.php | 2 +- htdocs/newsletter/index.php | 4 ++-- htdocs/newsletter/show.php | 8 ++++---- htdocs/newsletter/submit.php | 13 +++++++------ htdocs/referent.php | 35 ++++++++++------------------------- 5 files changed, 24 insertions(+), 38 deletions(-) diff --git a/htdocs/motdepassemd5.php b/htdocs/motdepassemd5.php index d530391..1c7fa2a 100644 --- a/htdocs/motdepassemd5.php +++ b/htdocs/motdepassemd5.php @@ -23,7 +23,7 @@ require_once('xorg.inc.php'); if (Env::has('response2')) { // la variable $response existe-t-elle ? // OUI, alors changeons le mot de passe - $password = $_POST['response2']; + $password = Post:;get('response2'); $sql = "UPDATE auth_user_md5 SET password='$password' WHERE user_id=".Session::getInt('uid'); $globals->db->query($sql); $_SESSION['log']->log('passwd', ''); diff --git a/htdocs/newsletter/index.php b/htdocs/newsletter/index.php index 97d709e..517b4d1 100644 --- a/htdocs/newsletter/index.php +++ b/htdocs/newsletter/index.php @@ -23,8 +23,8 @@ require_once("xorg.inc.php"); new_skinned_page('newsletter/index.tpl', AUTH_COOKIE); require_once("newsletter.inc.php"); -if(!empty($_GET['out'])) { unsubscribe_nl(); } -if(!empty($_GET['in'])) { subscribe_nl($_GET['in']=='html'); } +if(Get::has('out')) { unsubscribe_nl(); } +if(Get::has('in')) { subscribe_nl(Get::get('in')=='html'); } $page->assign('nls',get_nl_state()); $page->assign_by_ref('nl_list',get_nl_list()); diff --git a/htdocs/newsletter/show.php b/htdocs/newsletter/show.php index 7478917..8c0cf85 100644 --- a/htdocs/newsletter/show.php +++ b/htdocs/newsletter/show.php @@ -23,16 +23,16 @@ require_once("xorg.inc.php"); new_skinned_page('newsletter/show.tpl', AUTH_COOKIE, 'newsletter/head.tpl'); require_once("newsletter.inc.php"); -$nid = empty($_GET['nid']) ? 'last' : $_GET['nid']; +$nid = Get::get('nid', 'last'); $nl = new NewsLetter($nid); $page->assign_by_ref('nl',$nl); -if(isset($_POST['send'])) { - $res = $globals->db->query("SELECT pref FROM newsletter_ins WHERE user_id='{$_SESSION['uid']}'"); +if (Post::has('send')) { + $res = $globals->db->query('SELECT pref FROM newsletter_ins WHERE user_id='.Session::getInt('uid')); if (!(list($format) = mysql_fetch_row($res))) { $format = 'html'; } - $nl->sendTo($_SESSION['prenom'], $_SESSION['nom'], $_SESSION['bestalias'], $_SESSION['femme'], $format=='html'); + $nl->sendTo(Session::get('prenom'), Session::get('nom'), Session::get('bestalias'), Session::get('femme'), $format=='html'); } $page->run(); diff --git a/htdocs/newsletter/submit.php b/htdocs/newsletter/submit.php index 6b3312d..5eac8a3 100644 --- a/htdocs/newsletter/submit.php +++ b/htdocs/newsletter/submit.php @@ -23,16 +23,17 @@ require_once("xorg.inc.php"); new_skinned_page('newsletter/submit.tpl', AUTH_COOKIE, 'newsletter/head.tpl'); require_once("newsletter.inc.php"); -if(isset($_POST['see'])) { - $art = new NLArticle($_POST['title'], $_POST['body'], $_POST['append']); +if (Post::has('see')) { + $art = new NLArticle(Post::get('title'), Post::get('body'), Post::get('append')); $page->assign('art', $art); -} elseif(isset($_POST['valid'])) { - $nl = new Newsletter(); - $art = new NLArticle($_POST['title'], $_POST['body'], $_POST['append']); +} elseif (Post::has('valid')) { + $nl = new Newsletter(); + $art = new NLArticle(Post::get('title'), Post::get('body'), Post::get('append')); $nl->saveArticle($art); require_once("diogenes.hermes.inc.php"); - $from = "\"{$_SESSION['prenom']} {$_SESSION['nom']} ({$_SESSION['promo']})\" <{$_SESSION['forlife']}@polytechnique.org>"; + $from = sprintf('"%s %s (%s)" <%s@%s>', Session::get('prenom'), Session::get('nom'), + Session::get('promo'), Session::get('bestalias'), $globals->mail->domain); $mailer = new HermesMailer(); $mailer->setSubject("proposition d'article dans la NL"); $mailer->addTo('"Equipe Newsletter Polytechnique.org" '); diff --git a/htdocs/referent.php b/htdocs/referent.php index 6680edc..3daea44 100644 --- a/htdocs/referent.php +++ b/htdocs/referent.php @@ -23,33 +23,18 @@ require_once("xorg.inc.php"); new_skinned_page('referent.tpl',AUTH_COOKIE); -$nb_max_resultats_total = 100; +$nb_max_resultats_total = 100; $nb_max_resultats_par_page = 10; -$show_formulaire = true; +$show_formulaire = true; $page->assign_by_ref('show_formulaire', $show_formulaire); $page->assign('show_resultat', false); -$secteur_selectionne = ''; -if(isset($_POST['secteur'])){ - $secteur_selectionne = "{$_POST['secteur']}"; -} - -$ss_secteur_selectionne = ''; -if(isset($_POST['ss_secteur'])){ - $ss_secteur_selectionne = $_POST['ss_secteur']; -} +$secteur_selectionne = Post::get('secteur'); +$ss_secteur_selectionne = Post::get('ss_secteur'); +$pays_selectionne = Post::get('pays', '00'); +$expertise_champ = Post::get('expertise'); -$pays_selectionne = '00'; -if(isset($_POST['pays'])){ - $pays_selectionne = $_POST['pays']; -} - -$expertise_champ = ''; -if(isset($_POST['expertise'])){ - $expertise_champ = stripslashes($_POST['expertise']); -} - $page->assign('pays_selectionne',$pays_selectionne); $page->assign('expertise_champ',$expertise_champ); $page->assign('secteur_selectionne',$secteur_selectionne); @@ -87,7 +72,7 @@ mysql_free_result($res); $page->assign_by_ref('pays', $pays); //On vient d'un formulaire -if(isset($_REQUEST['Chercher'])){ +if (Env::has('Chercher')) { $champ_select = 'm.uid, a.prenom, a.nom, a.promo, l.alias, m.expertise'; $champ_select = $champ_select.', mp.pid'; @@ -121,7 +106,7 @@ if(isset($_REQUEST['Chercher'])){ $clause_where = substr($clause_where, 0, -3); //on vire le dernier AND $sql = "SELECT $champ_select $clause_from $clause_where - GROUP BY uid ORDER BY RAND({$_SESSION['uid']})"; + GROUP BY uid ORDER BY RAND(".Session::getInt('uid').')'; $res = $globals->db->query($sql); @@ -130,8 +115,8 @@ if(isset($_REQUEST['Chercher'])){ mysql_free_result($res); } else{ - if (isset($_REQUEST['page_courante'])) { - $page_courante = (int) $_REQUEST['page_courante']; + if (Env::has('page_courante')) { + $page_courante = Env::getInt('page_courante'); } else{ $page_courante = 1; -- 2.1.4