X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fregister.php;h=615faeaf914f6c7a09e0b6882de20e5c0f6e4061;hb=24bcf50c5f36f0770e2f7c279e7cd1077a4acead;hp=b15c9cb5179a185c14ccb3b9337b6cc03cd0e31b;hpb=7f54d35cba90063f7aed6984d5995eb8b3134abc;p=platal.git

diff --git a/modules/register.php b/modules/register.php
index b15c9cb..615faea 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('Docs.Charte');
                 if (Post::has('step1')) {
                     $sub_state['step'] = 1;
                     if (isset($sub_state['hash'])) {
@@ -115,6 +117,7 @@ class RegisterModule extends PLModule
                 break;
 
             case 3:
+                $alert = null;
                 if (count($_POST)) {
                     require_once('register.inc.php');
                     if (!isvalid_email(Post::v('email'))) {
@@ -131,21 +134,30 @@ class RegisterModule extends PLModule
                         $promo = (int)$sub_state['promo'];
                         if ($year > $promo - 15 || $year < $promo - 30) {
                             $err[] = "La 'Date de naissance' n'est pas correcte.";
-
-                            require_once("diogenes/diogenes.hermes.inc.php");
-                            $mailer = new HermesMailer();
-                            $mailer->setFrom("webmaster@polytechnique.org");
-                            $mailer->addTo("hotliners@polytechnique.org");
-                            $mailer->setSubject("ERREUR LORS DE L'INSCRIPTION de "
-                                   . $sub_state['prenom'] . ' ' . $sub_state['nom'] . '(' . $promo . ')');
-                            $mailer->setTxtBody(
-                                    "Date de naissance proposée $birth"
-                                   . "\n\nIndentifiants :\n" . var_export($sub_state, true)
-                                   . "\n\nInformations de connexion :\n" . var_export($_SERVER, true));
-                            $mailer->send();
+                            $alert = "Date de naissance proposée $birth\n\n";
                         }
                     }
 
+                    // Check if the given email is known as dangerous
+                    $res = Xdb::iterRow("SELECT  w.state, w.description, a.alias
+                                           FROM  emails       AS e
+                                     INNER JOIN  emails_watch AS w ON (e.email = w.email AND w.state != 'safe')
+                                     INNER JOIN  aliases      AS a ON (e.uid = a.id AND a.type = 'a_vie')
+                                          WHERE  e.email = {?}
+                                       ORDER BY  a.alias", Post::v('email'));
+                    $aliases = array();
+                    while(list($gstate, $gdescription, $alias) = $res->next()) {
+                        $state       = $gstate;
+                        $description = $gdescription;
+                        $aliases[]   = $alias;
+                    }
+                    if (count($aliases) != 0) {
+                        $alert .= "Email proposé : " . Post::v('email') . "\n"
+                                . "Ce mails est connu avec l'état $state :\n"
+                                . $description . "\n"
+                                . "Pour les alias :\n* " . join("\n* ", $aliases) . "\n\n";
+                    }
+
                     if (isset($err)) {
                         $err = join('<br />', $err);
                     } else {
@@ -157,6 +169,9 @@ class RegisterModule extends PLModule
                         $sub_state['step']      = 4;
                         finish_ins($sub_state);
                     }
+                    if (!is_null($alert)) {
+                        send_alert_mail($sub_state, $alert);
+                    }
                 }
                 break;
         }
@@ -236,12 +251,13 @@ 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);
 
-        $globals->hook->subscribe($forlife, $uid, $promo, $password);
+        global $platal;
+        $platal->on_subscribe($forlife, $uid, $promo, $password);
 
         require_once('xorg.mailer.inc.php');
         $mymail = new XOrgMailer('register/inscription.reussie.tpl');
@@ -257,7 +273,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
@@ -271,7 +287,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"
@@ -310,7 +326,7 @@ class RegisterModule extends PLModule
             $page->assign('mdpok', true);
         }
 
-        $page->addJsLink('javascript/motdepasse.js');
+        $page->addJsLink('motdepasse.js');
     }
 }