X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fregister.php;h=990dee89d3970a7a7e05e82a726e5e49b091b20f;hb=2ec25d62c74e5589620b2a2c89d5dbb041147d55;hp=16d02a78c454f29cf2ca2960bfd77ab8ea77c163;hpb=0e1dfbadefc72cc5aa6614351ee395d205d9eaea;p=platal.git

diff --git a/modules/register.php b/modules/register.php
index 16d02a7..990dee8 100644
--- a/modules/register.php
+++ b/modules/register.php
@@ -31,7 +31,10 @@ class RegisterModule extends PLModule
 
     function handler_register($page, $hash = null)
     {
-        $alert = null;
+        $page->forceSkin('register');
+
+        $alert = array();
+        $alert_details = '';
         $subState = new PlDict(S::v('subState', array()));
         if (!$subState->has('step')) {
             $subState->set('step', 0);
@@ -44,14 +47,15 @@ class RegisterModule extends PLModule
             $subState->v('backs')->set($subState->v('backs')->count() + 1, $subState->dict());
             $subState->v('backs')->kill('backs');
             if ($subState->v('backs')->count() == 3) {
-                $alert .= "Tentative d'inscription très hésitante - ";
+                $alert[] = "Tentative d'inscription très hésitante";
+                $alert_details .= "\n   * Retours en arrières : 3.";
             }
         }
 
         if ($hash) {
             $res = XDB::query("SELECT  a.uid, a.hruid, ppn.lastname_initial AS lastname, ppn.firstname_initial AS firstname, p.xorg_id AS xorgid,
                                        pd.promo, pe.promo_year AS yearpromo, pde.degree AS edu_type,
-                                       p.birthdate_ref AS birthdateRef, FIND_IN_SET('watch', a.flags) AS watch, m.hash, a.type
+                                       p.birthdate_ref AS birthdateRef, FIND_IN_SET('watch', a.flags) AS watch, m.hash, a.type, a.comment
                                  FROM  register_marketing AS m
                            INNER JOIN  accounts           AS a   ON (m.uid = a.uid)
                            INNER JOIN  account_profiles   AS ap  ON (a.uid = ap.uid AND FIND_IN_SET('owner', ap.perms))
@@ -153,9 +157,10 @@ class RegisterModule extends PLModule
                     // Validate the email address format and domain.
                     require_once 'emails.inc.php';
 
+                    $user = User::get($subState->s('uid'));
                     if (!isvalid_email(Post::v('email'))) {
                         $error[] = "Le champ 'Email' n'est pas valide.";
-                    } elseif (!isvalid_email_redirection(Post::v('email'))) {
+                    } elseif (!isvalid_email_redirection(Post::v('email'), $user)) {
                         $error[] = $subState->s('forlife') . ' doit renvoyer vers un email existant '
                                  . 'valide, en particulier, il ne peut pas être renvoyé vers lui-même.';
                     }
@@ -175,7 +180,13 @@ class RegisterModule extends PLModule
                         $ref_year = substr($subState->v('birthdateRef'), 0, 4);
                         if (abs($ref_year - $year) > 2) {
                             $error[] = "La 'Date de naissance' n'est pas correcte.";
-                            $alert = "Date de naissance incorrecte à l'inscription - ";
+                            $alert[] = "Date de naissance incorrecte à l'inscription";
+                            $alert_details .= "\n   * Date de naissance renseignée : " . Post::t('birthdate');
+                            if ($subState->v('birthdateRef') == '0000-00-00') {
+                                $alert_details .= ' (date inconnue)';
+                            } else {
+                                $alert_details .= ' (date connue : ' . $subState->v('birthdateRef') . ')';
+                            }
                             $subState->set('wrong_birthdate', $birth);
                         }
                     }
@@ -202,14 +213,16 @@ class RegisterModule extends PLModule
                     $bannedEmail = false;
                     if ($res->numRows()) {
                         list($state, $description) = $res->fetchOneRow();
-                        $alert .= "Email surveillé proposé à l'inscription - ";
+                        $alert[] = "Email surveillé proposé à l'inscription";
+                        $alert_details .= "\n   * Email surveillé : " . Post::v('email');
                         $subState->set('email_desc', $description);
                         if ($state == 'dangerous') {
                             $bannedEmail = true;
                         }
                     }
                     if ($subState->i('watch') != 0) {
-                        $alert .= "Inscription d'un utilisateur surveillé - ";
+                        $alert[] = "Inscription d'un utilisateur surveillé";
+                        $alert_details .= "\n   * Commentaire pour la surveillance : " . $subState->v('comment');
                     }
 
                     if (($bannedIp = check_ip('unsafe'))) {
@@ -228,10 +241,17 @@ class RegisterModule extends PLModule
                         // or if the IP address of the user has been banned.
                         if ($subState->s('birthdateRef') != '0000-00-00'
                             && $subState->s('birthdateRef') != $subState->s('birthdate')) {
-                            $alert .= "Date de naissance incorrecte à l'inscription - ";
+                            $alert[] = "Date de naissance incorrecte à l'inscription";
+                            $alert_details .= "\n   * Date de naissance renseignée : " . Post::t('birthdate');
+                            if ($subState->v('birthdateRef') == '0000-00-00') {
+                                $alert_details .= ' (date inconnue)';
+                            } else {
+                                $alert_details .= ' (date connue : ' . $subState->v('birthdateRef') . ')';
+                            }
                         }
                         if ($bannedIp) {
-                            $alert .= "Tentative d'inscription depuis une IP surveillée";
+                            $alert[] = "Tentative d'inscription depuis une IP surveillée";
+                            $alert_details .= "\n   * IP surveillée : " . $_SESSION['check_ip'];
                         }
 
                         // Prevent banned user from actually registering; save the current state for others.
@@ -244,7 +264,8 @@ class RegisterModule extends PLModule
                         } else {
                             $subState->set('step', 4);
                             if ($subState->v('backs')->count() >= 3) {
-                                $alert .= "Fin d'une inscription hésitante.";
+                                $alert[] = "Fin d'une inscription hésitante";
+                                $alert_details .= "\n   * Nombre de retours en arrière : " . $subState->v('backs')->count();
                             }
                             finishRegistration($subState);
                         }
@@ -254,8 +275,11 @@ class RegisterModule extends PLModule
         }
 
         $_SESSION['subState'] = $subState->dict();
-        if (!empty($alert)) {
-            send_warning_mail($alert);
+        if (count($alert)) {
+            $alert_details = "Détails des alertes :" . $alert_details . "\n\n";
+            $alert_details .= 'Compte concerné : ' . $subState->s('forlife') . ' (redirection vers : '
+                           . ($subState->s('email') == '' ? Post::t('email') : $subState->s('email')). ")\n\n\n";
+            send_warning_mail(implode(' - ', $alert), $alert_details);
         }
 
         $page->changeTpl('register/step' . $subState->i('step') . '.tpl');
@@ -283,7 +307,7 @@ class RegisterModule extends PLModule
         $res = XDB::query("SELECT  r.uid, p.pid, r.forlife, r.bestalias, r.mailorg2,
                                    r.password, r.email, r.services, r.naissance,
                                    ppn.lastname_initial, ppn.firstname_initial, pe.promo_year,
-                                   pd.promo, p.sex, p.birthdate_ref, a.type
+                                   pd.promo, p.sex, p.birthdate_ref, a.type, a.email AS old_account_email
                              FROM  register_pending AS r
                        INNER JOIN  accounts         AS a   ON (r.uid = a.uid)
                        INNER JOIN  account_profiles AS ap  ON (a.uid = ap.uid AND FIND_IN_SET('owner', ap.perms))
@@ -309,7 +333,7 @@ class RegisterModule extends PLModule
         }
 
         list($uid, $pid, $forlife, $bestalias, $emailXorg2, $password, $email, $services,
-             $birthdate, $lastname, $firstname, $yearpromo, $promo, $sex, $birthdate_ref, $type) = $res->fetchOneRow();
+             $birthdate, $lastname, $firstname, $yearpromo, $promo, $sex, $birthdate_ref, $type, $old_account_email) = $res->fetchOneRow();
         $isX = ($type == 'x');
         $mail_domain = User::$sub_mail_domains[$type] . $globals->mail->domain;
 
@@ -368,9 +392,17 @@ class RegisterModule extends PLModule
         $redirect->add_email($email);
         fix_bestalias($user);
 
+        // If the user was registered to some aliases and MLs, we must change
+        // the subscription to her forlife email.
+        if ($old_account_email) {
+            $listClient = new MMList($user);
+            $listClient->change_user_email($old_account_email, $user->forlifeEmail());
+            update_alias_user($old_account_email, $user->forlifeEmail());
+        }
+
         // Try to start a session (so the user don't have to log in); we will use
         // the password available in Post:: to authenticate the user.
-        Platal::session()->start(AUTH_MDP);
+        Platal::session()->start(AUTH_PASSWD);
 
         // Subscribe the user to the services she did request at registration time.
         require_once 'newsletter.inc.php';
@@ -429,9 +461,9 @@ class RegisterModule extends PLModule
 
         // Notify other users which were watching for her arrival.
         XDB::execute('INSERT INTO  contacts (uid, contact)
-                           SELECT  uid, ni_id
+                           SELECT  uid, {?}
                              FROM  watch_nonins
-                            WHERE  ni_id = {?}', $uid);
+                            WHERE  ni_id = {?}', $pid, $uid);
         XDB::execute('DELETE FROM  watch_nonins
                             WHERE  ni_id = {?}', $uid);
         Platal::session()->updateNbNotifs();