X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fregister.php;h=002b7ef394d8387cfe48bfb04585152504582669;hb=1d10d3fd659fa8eb7c663d6bb599bc8bbc0feeb3;hp=9d322986d235d10d65da9b5985eea415925f088b;hpb=8d8f76072d8a363c3b24cfd0f2728bdc5754ec7f;p=platal.git

diff --git a/modules/register.php b/modules/register.php
index 9d32298..002b7ef 100644
--- a/modules/register.php
+++ b/modules/register.php
@@ -70,6 +70,8 @@ class RegisterModule extends PLModule
 
         switch ($sub_state['step']) {
             case 0:
+                require_once('wiki.inc.php');
+                wiki_require_page('Reference.Charte');
                 if (Post::has('step1')) {
                     $sub_state['step'] = 1;
                     if (isset($sub_state['hash'])) {
@@ -83,8 +85,13 @@ class RegisterModule extends PLModule
             case 1:
                 if (Post::has('promo')) {
                     $promo = Post::i('promo');
-                    if ($promo < 1900 || $promo > date('Y')) {
-                        $err = "La promotion saisie est incorrecte !";
+                    $res = XDB::query("SELECT COUNT(*)
+                                         FROM auth_user_md5
+                                        WHERE  perms='pending' AND deces = '0000-00-00'
+                                               AND promo = {?}",
+                                      $promo);
+                    if (!$res->fetchOneCell()) {
+                        $err = "La promotion saisie est incorrecte ou tous les camardes de cette promo sont inscrits !";
                     } else {
                         $sub_state['step']  = 2;
                         $sub_state['promo'] = $promo;
@@ -175,7 +182,7 @@ class RegisterModule extends PLModule
         }
 
         $_SESSION['sub_state'] = $sub_state;
-        $page->changeTpl('register/step'.intval($sub_state['step']).'.tpl', SIMPLE);
+        $page->changeTpl('register/step'.intval($sub_state['step']).'.tpl');
         if (isset($err)) {
             $page->trig($err);
         }
@@ -191,7 +198,7 @@ class RegisterModule extends PLModule
         global $globals;
 
         $page->changeTpl('register/end.tpl');
-
+        $_SESSION['sub_state'] = array('step' => 5);
         require_once('user.func.inc.php');
 
         if ($hash) {
@@ -249,7 +256,7 @@ class RegisterModule extends PLModule
         $redirect->add_email($email);
 
         // on cree un objet logger et on log l'inscription
-        $logger = new DiogenesCoreLogger($uid);
+        $logger = new CoreLogger($uid);
         $logger->log('inscription', $email);
 
         XDB::execute('UPDATE register_pending SET hash="INSCRIT" WHERE uid={?}', $uid);
@@ -271,7 +278,7 @@ class RegisterModule extends PLModule
         /***********************************************************/
         $res = XDB::iterRow(
                 "SELECT  DISTINCT sa.alias, IF(s.nom_usage,s.nom_usage,s.nom) AS nom,
-                         s.prenom, s.flags AS femme
+                         s.prenom, FIND_IN_SET('femme', s.flags) AS femme
                    FROM  register_marketing AS m
              INNER JOIN  auth_user_md5      AS s  ON ( m.sender = s.user_id )
              INNER JOIN  aliases            AS sa ON ( sa.id = m.sender
@@ -285,7 +292,7 @@ class RegisterModule extends PLModule
             $mymail->setSubject("$prenom $nom s'est inscrit à Polytechnique.org !");
             $mymail->setFrom('"Marketing Polytechnique.org" <register@polytechnique.org>');
             $mymail->addTo("\"$sprenom $snom\" <$salias@{$globals->mail->domain}>");
-            $msg = ($sfemme?'Cher':'Chère')." $sprenom,\n\n"
+            $msg = ($sfemme?'Chère':'Cher')." $sprenom,\n\n"
                  . "Nous t'écrivons pour t'informer que {$prenom} {$nom} (X{$promo}), "
                  . "que tu avais incité".($femme?'e':'')." à s'inscrire à Polytechnique.org, "
                  . "vient à l'instant de terminer son inscription.\n\n"
@@ -306,6 +313,7 @@ class RegisterModule extends PLModule
     {
         $page->changeTpl('register/success.tpl');
 
+        $_SESSION['sub_state'] = array('step' => 5);
         if (Env::has('response2'))  {
             $_SESSION['password'] = $password = Post::v('response2');
 
@@ -324,7 +332,7 @@ class RegisterModule extends PLModule
             $page->assign('mdpok', true);
         }
 
-        $page->addJsLink('javascript/motdepasse.js');
+        $page->addJsLink('motdepasse.js');
     }
 }