X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fregister.php;h=82ada2c91c3f32d583cf990ef2dd920fd819d7af;hb=2a24bda28f9dcc322ba00dd382d1a96121c00e31;hp=d2825dd9ace7163670c996fa10f8fc659d80ef40;hpb=85b2b2257110a8c77d70624f0fa9bba402d99e5f;p=platal.git diff --git a/modules/register.php b/modules/register.php index d2825dd..82ada2c 100644 --- a/modules/register.php +++ b/modules/register.php @@ -1,6 +1,6 @@ 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.'; } @@ -180,14 +181,19 @@ 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); } } // Register the optional services requested by the user. $services = array(); - foreach (array('ax_letter', 'imap', 'ml_promo', 'nl') as $service) { + foreach (array('com_letters', 'imap', 'ml_promo', 'nl') as $service) { if (Post::b($service)) { $services[] = $service; } @@ -236,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"; @@ -265,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); } @@ -294,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)) @@ -320,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; @@ -372,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); @@ -379,17 +396,26 @@ class RegisterModule extends PLModule $redirect->add_email($email); fix_bestalias($user); - // 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); + // 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()); + } // Subscribe the user to the services she did request at registration time. require_once 'newsletter.inc.php'; foreach (explode(',', $services) as $service) { switch ($service) { - case 'ax_letter': + case 'ax_letter': /* This option is deprecated by 'com_letters' */ NewsLetter::forGroup(NewsLetter::GROUP_AX)->subscribe($user); break; + case 'com_letters': + NewsLetter::forGroup(NewsLetter::GROUP_AX)->subscribe($user); + NewsLetter::forGroup(NewsLetter::GROUP_EP)->subscribe($user); + NewsLetter::forGroup(NewsLetter::GROUP_FX)->subscribe($user); + break; case 'nl': NewsLetter::forGroup(NewsLetter::GROUP_XORG)->subscribe($user); break; @@ -405,8 +431,7 @@ class RegisterModule extends PLModule VALUES ({?}, {?})', $uid, $asso_id); try { - $mmlist = new MMList($user); - $mmlist->subscribe("promo" . $yearpromo); + MailingList::subscribePromo($yearpromo, $user); } catch (Exception $e) { PlErrorReport::report($e); $page->trigError("L'inscription à la liste promo" . $yearpromo . " a échouée."); @@ -440,9 +465,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(); @@ -543,5 +568,5 @@ class RegisterModule extends PLModule } } -// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8: ?>