Start using the new MailingList class.

[platal.git] / modules / register.php

diff --git a/modules/register.php b/modules/register.php
index 16d0f20..70480c7 100644 (file)
--- a/modules/register.php
+++ b/modules/register.php
@@ -181,7 +181,12 @@ class RegisterModule extends PLModule
                         if (abs($ref_year - $year) > 2) {
                             $error[] = "La 'Date de naissance' n'est pas correcte.";
                             $alert[] = "Date de naissance incorrecte à l'inscription";
-                            $alert_details .= "\n   * Date de naissance renseignée : " . Post::t('birthdate') . ' (date connue : ' . $subState->v('birthdateRef') . ')';
+                            $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);
                         }
                     }
@@ -237,7 +242,12 @@ class RegisterModule extends PLModule
                         if ($subState->s('birthdateRef') != '0000-00-00'
                             && $subState->s('birthdateRef') != $subState->s('birthdate')) {
                             $alert[] = "Date de naissance incorrecte à l'inscription";
-                            $alert_details .= "\n   * Date de naissance renseignée : " . $subState->s('birthdate') . ' (date connue : ' . $subState->s('birthdateRef') . ')';
+                            $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";
@@ -266,7 +276,9 @@ class RegisterModule extends PLModule
 
         $_SESSION['subState'] = $subState->dict();
         if (count($alert)) {
-            $alert_details = "Détails des alertes :" . $alert_details . "\n\n\n";
+            $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);
         }
 
@@ -373,6 +385,10 @@ class RegisterModule extends PLModule
         }
         XDB::commit();
 
+        // 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_PASSWD);
+
         // Add the registration email address as first and only redirection.
         require_once 'emails.inc.php';
         $user = User::getSilentWithUID($uid);
@@ -388,10 +404,6 @@ class RegisterModule extends PLModule
             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_PASSWD);
-
         // Subscribe the user to the services she did request at registration time.
         require_once 'newsletter.inc.php';
         foreach (explode(',', $services) as $service) {
@@ -414,8 +426,8 @@ class RegisterModule extends PLModule
                                                       VALUES  ({?}, {?})',
                                          $uid, $asso_id);
                             try {
-                                $mmlist = new MMList($user);
-                                $mmlist->subscribe("promo" . $yearpromo);
+                                $mlist = MailingList::promo($yearpromo, $user);
+                                $mlist->subscribe();
                             } catch (Exception $e) {
                                 PlErrorReport::report($e);
                                 $page->trigError("L'inscription à la liste promo" . $yearpromo . " a échouée.");
@@ -449,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();