From: Pierre Habouzit (MadCoder Date: Sun, 19 Dec 2004 11:44:56 +0000 (+0000) Subject: refactor some ins code X-Git-Tag: xorg/old~636 X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=c7b547c828bc96192ab7fe1475516e02835090cf;p=platal.git refactor some ins code git-archimport-id: opensource@polytechnique.org--2005/platal--mainline--0.9--patch-112 --- diff --git a/htdocs/inscription/maj.php b/htdocs/inscription/maj.php index aefb747..49a9212 100644 --- a/htdocs/inscription/maj.php +++ b/htdocs/inscription/maj.php @@ -21,46 +21,45 @@ require_once("xorg.inc.php"); -if (isset($_REQUEST['n'])) { - $sql = "SELECT * FROM envoidirect WHERE uid='".$_REQUEST["n"]."'"; +if (Env::has('n')) { + $sql = "SELECT * FROM envoidirect WHERE uid=".Env::getInt('n'); $result = $globals->db->query($sql); - $ligne = mysql_fetch_array($result); -} + if ($ligne = mysql_fetch_assoc($result)) { -if (isset($ligne) && $ligne) { - if(!isset($_REQUEST['charte'])) { - new_skinned_page('inscription/step1a.tpl', AUTH_PUBLIC); - $page->run(); - } + if (!Env::has('charte')) { + new_skinned_page('inscription/step1a.tpl', AUTH_PUBLIC); + $page->run(); + } - // il faut remettre le matricule dans son format de saisie - - $year = intval(substr($ligne['matricule'],0,4)); - $rang = intval(substr($ligne['matricule'],4,4)); - if($year<1996) { - $_REQUEST['matricule'] = ''; - } elseif($year<2000) { - $_REQUEST['matricule'] = sprintf('%02u0%03u',$year % 100,$rang); - } elseif($year<2100) { - $_REQUEST['matricule'] = sprintf('1%02u%03u',$year % 100,$rang); - } - $_REQUEST['promo'] = $ligne['promo']; - $_REQUEST['nom'] = $ligne['nom']; - $_REQUEST['prenom'] = $ligne['prenom']; - $_REQUEST['email'] = $ligne['email']; + // il faut remettre le matricule dans son format de saisie - new_skinned_page('inscription/step2.tpl', AUTH_PUBLIC); - require_once("identification.inc.php"); - require_once("applis.func.inc.php"); - - $page->assign('homonyme', $homonyme); - $page->assign('forlife', $forlife); - $page->assign('mailorg', $mailorg); - $page->assign('prenom', $prenom); - $page->assign('nom', $nom); + $year = intval(substr($ligne['matricule'],0,4)); + $rang = intval(substr($ligne['matricule'],4,4)); + if($year<1996) { + $_REQUEST['matricule'] = ''; + } elseif($year<2000) { + $_REQUEST['matricule'] = sprintf('%02u0%03u',$year % 100,$rang); + } elseif($year<2100) { + $_REQUEST['matricule'] = sprintf('1%02u%03u',$year % 100,$rang); + } + $_REQUEST['promo'] = $ligne['promo']; + $_REQUEST['nom'] = $ligne['nom']; + $_REQUEST['prenom'] = $ligne['prenom']; + $_REQUEST['email'] = $ligne['email']; - $page->assign('envoidirect',$_REQUEST['n']); - $page->run(); + new_skinned_page('inscription/step2.tpl', AUTH_PUBLIC); + require_once("identification.inc.php"); + require_once("applis.func.inc.php"); + + $page->assign('homonyme', $homonyme); + $page->assign('forlife', $forlife); + $page->assign('mailorg', $mailorg); + $page->assign('prenom', $prenom); + $page->assign('nom', $nom); + + $page->assign('envoidirect', Env::getInt('n')); + $page->run(); + } } new_skinned_page('inscription/maj.tpl', AUTH_PUBLIC); diff --git a/htdocs/inscription/step3.php b/htdocs/inscription/step3.php index 5b7743b..8a1d787 100644 --- a/htdocs/inscription/step3.php +++ b/htdocs/inscription/step3.php @@ -26,16 +26,16 @@ require_once("identification.inc.php"); $page->assign('mailorg', $mailorg); $page->assign('forlife', $forlife); -if(!isvalid_email($_REQUEST["email"])) { +if (!isvalid_email(Env::get('email'))) { $page->trig("Le champ 'E-mail' n'est pas valide."); } -if (!isvalid_email_redirection($_REQUEST["email"])) { +if (!isvalid_email_redirection(Env::get('email'))) { $page->trig("\"$forlife@polytechnique.org\" doit renvoyer vers un email existant valide. En particulier, il ne peut pas être renvoyé vers lui-même."); } -if (!ereg("[0-3][0-9][0-1][0-9][1][9]([0-9]{2})", $_REQUEST["naissance"])) { +if (!ereg("[0-3][0-9][0-1][0-9][1][9]([0-9]{2})", Env::get('naissance'))) { $page->trig("La 'Date de naissance' n'est pas correcte. Elle est obligatoire pour continuer mais ne sera jamais visible sur le site par la suite."); } @@ -52,41 +52,40 @@ if($page->nb_errs()) { $page->run(); } -$ins_id=rand_url_id(12); -$pass_clair=rand_pass(); -$password=md5($pass_clair); -$date=date("Y-m-j"); +$ins_id = rand_url_id(12); +$pass_clair = rand_pass(); +$password = md5($pass_clair); +$date = date("Y-m-j"); -// on nettoie les appli_type(1|2) si elles ne sont pas affectees -if (!isset($_REQUEST["appli_type1"])) $_REQUEST["appli_type1"]=0; -if (!isset($_REQUEST["appli_type2"])) $_REQUEST["appli_type2"]=0; if (!isset($loginbis)) $loginbis=""; -$birth = sprintf("%s-%s-%s", substr($_REQUEST["naissance"],4,4), substr($_REQUEST["naissance"],2,2), substr($_REQUEST["naissance"],0,2)); +$birth = sprintf("%s-%s-%s", substr(Env::get('naissance'),4,4), + substr(Env::get('naissance'),2,2), substr(Env::get('naissance'),0,2)); // nouvelle inscription $sql="REPLACE INTO en_cours SET ins_id='$ins_id', password='$password', matricule='$matricule', promo='$promo', - nom='".addslashes($nom)."', prenom='".addslashes($prenom)."', email='{$_REQUEST['email']}', - naissance='$birth', date='$date', nationalite='{$_REQUEST['nationalite']}', - appli_id1='{$_REQUEST['appli_id1']}', appli_type1='{$_REQUEST['appli_type1']}', - appli_id2='{$_REQUEST['appli_id2']}', appli_type2='{$_REQUEST['appli_type2']}', - loginbis='$mailorg', username='$forlife'"; + nom='".addslashes($nom)."', prenom='".addslashes($prenom)."', email='".Env::get('email')."', + naissance='$birth', date='$date', nationalite='".Env::get('nationalite')."', + appli_id1='".Env::get('appli_id1')."', appli_type1='".Env::get('appli_type1')."', + appli_id2='".Env::get('appli_id2')."', appli_type2='".Env::get('appli_type2')."', + loginbis='$mailorg', username='$forlife'"; $globals->db->query($sql); -$globals->db->query("UPDATE auth_user_md5 SET last_known_email='{$_REQUEST['email']}' WHERE matricule = $matricule"); +$globals->db->query("UPDATE auth_user_md5 SET last_known_email='".Env::get('email')."' WHERE matricule = $matricule"); // si on venait de la page maj.php, on met a jour la table envoidirect -if(isset($_REQUEST['envoidirect'])) - $globals->db->query("UPDATE envoidirect SET date_succes=NOW() WHERE uid='{$_REQUEST['envoidirect']}'"); +if (Env::has('envoidirect')) { + $globals->db->query("UPDATE envoidirect SET date_succes=NOW() WHERE uid=".Env::getInt('envoidirect')); +} -require_once("xorg.mailer.inc.php"); +require_once('xorg.mailer.inc.php'); $mymail = new XOrgMailer('inscrire.mail.tpl'); -$mymail->assign('forlife',$forlife); -$mymail->assign('lemail',$_REQUEST['email']); -$mymail->assign('pass_clair',$pass_clair); -$mymail->assign('baseurl',$globals->baseurl); -$mymail->assign('ins_id',$ins_id); -$mymail->assign('subj',$forlife."@polytechnique.org"); +$mymail->assign('forlife', $forlife); +$mymail->assign('lemail', Env::get('email')); +$mymail->assign('pass_clair', $pass_clair); +$mymail->assign('baseurl', $globals->baseurl); +$mymail->assign('ins_id', $ins_id); +$mymail->assign('subj', $forlife."@polytechnique.org"); $mymail->send(); $page->run(); diff --git a/htdocs/inscription/step4.php b/htdocs/inscription/step4.php index 49d5cc0..8dc0103 100644 --- a/htdocs/inscription/step4.php +++ b/htdocs/inscription/step4.php @@ -25,16 +25,16 @@ new_skinned_page('inscription/step4.tpl', AUTH_PUBLIC); require_once("user.func.inc.php"); require_once('xorg.mailer.inc.php'); -if (!empty($_REQUEST['ref'])) { - $sql = "SELECT username,loginbis,matricule,promo,password". - ",nom,prenom,nationalite,email,naissance,date". - ",appli_id1,appli_type1,appli_id2,appli_type2". - " FROM en_cours WHERE ins_id='".$_REQUEST["ref"]."'"; +if (Env::has('ref')) { + $sql = "SELECT username,loginbis,matricule,promo,password, + nom,prenom,nationalite,email,naissance,date, + appli_id1,appli_type1,appli_id2,appli_type2 + FROM en_cours WHERE ins_id=".Env::getInt('ref'); $res = $globals->db->query($sql); } //vérifions que la référence de l'utilisateur est -if (empty($_REQUEST['ref']) || +if (!Env::has('ref')) || !list( $forlife, $alias, $matricule, $promo, $password, $nom, $prenom,$nationalite, $email, $naissance,$date,$appli_id1,$appli_type1,$appli_id2,$appli_type2) = mysql_fetch_row($res)) {