= 3) {
- $alert .= "Fin d'une inscription hésitante";
+ $subState->set('step', 4);
+ if ($subState->v('backs')->count() >= 3) {
+ $alert .= "Fin d'une inscription hésitante.";
}
- finish_ins($sub_state);
+ finishRegistration($subState);
}
}
}
break;
}
- $_SESSION['sub_state'] = $sub_state;
+ $_SESSION['subState'] = $subState->dict();
if (!empty($alert)) {
send_warning_mail($alert);
}
- $page->changeTpl('register/step'.intval($sub_state['step']).'.tpl');
- $page->addJsLink('motdepasse.js');
- if (isset($err)) {
- $page->trigError($err);
+ $page->changeTpl('register/step' . $subState->i('step') . '.tpl');
+ if (isset($error)) {
+ $page->trigError($error);
}
}
- function handler_end(&$page, $hash = null)
+ function handler_end($page, $hash = null)
{
global $globals;
- $_SESSION['sub_state'] = array('step' => 5);
+ $_SESSION['subState'] = array('step' => 5);
// Reject registration requests from unsafe IP addresses (and remove the
// registration information from the database, to prevent IP changes).
if (check_ip('unsafe')) {
- send_warning_mail('Une IP surveillée a tenté de finaliser son inscription');
+ send_warning_mail('Une IP surveillée a tenté de finaliser son inscription.');
XDB::execute("DELETE FROM register_pending
WHERE hash = {?} AND hash != 'INSCRIT'", $hash);
return PL_FORBIDDEN;
}
- require_once('user.func.inc.php');
+ $nameTypes = DirEnum::getOptions(DirEnum::NAMETYPES);
+ $nameTypes = array_flip($nameTypes);
// Retrieve the pre-registration information using the url-provided
// authentication token.
- if ($hash) {
- $res = XDB::query(
- "SELECT r.uid, r.forlife, r.bestalias, r.mailorg2,
- r.password, r.email, r.naissance, u.nom, u.prenom,
- u.promo, FIND_IN_SET('femme', u.flags), u.naissance_ini
- FROM register_pending AS r
- INNER JOIN auth_user_md5 AS u ON r.uid = u.user_id
- WHERE hash = {?} AND hash != 'INSCRIT'", $hash);
- }
+ $res = XDB::query("SELECT r.uid, p.pid, r.forlife, r.bestalias, r.mailorg2,
+ r.password, r.email, r.services, r.naissance,
+ pnl.name AS lastname, pnf.name AS firstname,
+ pd.promo, p.sex, p.birthdate_ref, a.type AS eduType
+ 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))
+ INNER JOIN profiles AS p ON (p.pid = ap.pid)
+ INNER JOIN profile_name AS pnl ON (p.pid = pnl.pid AND pnl.typeid = {?})
+ INNER JOIN profile_name AS pnf ON (p.pid = pnf.pid AND pnf.typeid = {?})
+ INNER JOIN profile_display AS pd ON (p.pid = pd.pid)
+ WHERE hash = {?} AND hash != 'INSCRIT' AND a.state = 'pending'",
+ $nameTypes['name_ini'], $nameTypes['firstname_ini'], $hash);
if (!$hash || $res->numRows() == 0) {
$page->kill("Cette adresse n'existe pas, ou plus, sur le serveur.
Causes probables :
@@ -268,28 +302,28 @@ class RegisterModule extends PLModule
Tu as peut-être mal copié l'adresse reçue par
email, vérifie-la à la main.
Tu as peut-être attendu trop longtemps pour
- confirmer. Les pré-inscriptions sont annulées
+ confirmer. Les pré-inscriptions sont annulées
tous les 30 jours.
Tu es en fait déjà inscrit.
");
}
- list($uid, $forlife, $bestalias, $mailorg2, $password, $email,
- $naissance, $nom, $prenom, $promo, $femme, $naiss_ini) = $res->fetchOneRow();
+ list($uid, $pid, $forlife, $bestalias, $emailXorg2, $password, $email, $services,
+ $birthdate, $lastname, $firstname, $promo, $sex, $birthdate_ref, $eduType) = $res->fetchOneRow();
+ $isX = ($eduType == 'x');
+ $yearpromo = substr($promo, 1, 4);
+ $mail_domain = User::$sub_mail_domains[$eduType] . $globals->mail->domain;
// Prepare the template for display.
$page->changeTpl('register/end.tpl');
- $page->addJsLink('do_challenge_response_logged.js');
$page->assign('forlife', $forlife);
- $page->assign('prenom', $prenom);
- $page->assign('femme', $femme);
+ $page->assign('firstname', $firstname);
// Check if the user did enter a valid password; if not (or if none is found),
// get her an information page.
- if (Env::has('response')) {
- require_once 'secure_hash.inc.php';
- $expected_response = hash_encrypt("$forlife:$password:" . S::v('challenge'));
- if (Env::v('response') != $expected_response) {
+ if (Post::has('response')) {
+ $expected_response = sha1("$forlife:$password:" . S::v('challenge'));
+ if (Post::v('response') != $expected_response) {
$page->trigError("Mot de passe invalide.");
S::logger($uid)->log('auth_fail', 'bad password (register/end)');
return;
@@ -301,26 +335,75 @@ class RegisterModule extends PLModule
//
// Create the user account.
//
- XDB::execute("UPDATE auth_user_md5
- SET password = {?}, perms = 'user',
- date = NOW(), naissance = {?}, date_ins = NOW()
- WHERE user_id = {?}", $password, $naissance, $uid);
- XDB::execute("REPLACE INTO auth_user_quick (user_id) VALUES ({?})", $uid);
- XDB::execute("INSERT INTO aliases (id, alias, type)
- VALUES ({?}, {?}, 'a_vie')", $uid, $forlife);
- XDB::execute("INSERT INTO aliases (id, alias, type, flags)
- VALUES ({?}, {?}, 'alias', 'bestalias')", $uid, $bestalias);
- if ($mailorg2) {
- XDB::execute("INSERT INTO aliases (id, alias, type)
- VALUES ({?}, {?}, 'alias')", $uid, $mailorg2);
+ XDB::startTransaction();
+ XDB::execute("UPDATE accounts
+ SET password = {?}, state = 'active',
+ registration_date = NOW(), email = NULL
+ WHERE uid = {?}", $password, $uid);
+ XDB::execute("UPDATE profiles
+ SET birthdate = {?}, last_change = NOW()
+ WHERE pid = {?}", $birthdate, $pid);
+ XDB::execute('INSERT INTO email_source_account (email, uid, type, flags, domain)
+ SELECT {?}, {?}, \'forlife\', \'\', id
+ FROM email_virtual_domains
+ WHERE name = {?}',
+ $forlife, $uid, $mail_domain);
+ XDB::execute('INSERT INTO email_source_account (email, uid, type, flags, domain)
+ SELECT {?}, {?}, \'alias\', \'bestalias\', id
+ FROM email_virtual_domains
+ WHERE name = {?}',
+ $bestalias, $uid, $mail_domain);
+ if ($emailXorg2) {
+ XDB::execute('INSERT INTO email_source_account (email, uid, type, flags, domain)
+ SELECT {?}, {?}, \'alias\', \'\', id
+ FROM email_virtual_domains
+ WHERE name = {?}',
+ $emailXorg2, $uid, $mail_domain);
}
+ XDB::commit();
// Add the registration email address as first and only redirection.
- require_once('emails.inc.php');
- $user = User::getSilent($uid);
+ require_once 'emails.inc.php';
+ $user = User::getSilentWithUID($uid);
$redirect = new Redirect($user);
$redirect->add_email($email);
+ // 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);
+
+ // Subscribe the user to the services she did request at registration time.
+ foreach (explode(',', $services) as $service) {
+ require_once 'newsletter.inc.php';
+ switch ($service) {
+ case 'ax_letter':
+ NewsLetter::forGroup(NewsLetter::GROUP_AX)->subscribe($user);
+ break;
+ case 'nl':
+ NewsLetter::forGroup(NewsLetter::GROUP_XORG)->subscribe($user);
+ break;
+ case 'imap':
+ Email::activate_storage($user, 'imap');
+ break;
+ case 'ml_promo':
+ $r = XDB::query('SELECT id FROM groups WHERE diminutif = {?}', $yearpromo);
+ if ($r->numRows()) {
+ $asso_id = $r->fetchOneCell();
+ XDB::execute('INSERT IGNORE INTO group_members (uid, asso_id)
+ VALUES ({?}, {?})',
+ $uid, $asso_id);
+ try {
+ $mmlist = new MMList($user);
+ $mmlist->subscribe("promo" . $yearpromo);
+ } catch (Exception $e) {
+ PlErrorReport::report($e);
+ $page->trigError("L'inscription à la liste promo" . $yearpromo . " a échouée.");
+ }
+ }
+ break;
+ }
+ }
+
// Log the registration in the user session.
S::logger($uid)->log('inscription', $email);
XDB::execute("UPDATE register_pending
@@ -328,37 +411,48 @@ class RegisterModule extends PLModule
WHERE uid = {?}", $uid);
// Congratulate our newly registered user by email.
- $mymail = new PlMailer('register/inscription.reussie.tpl');
+ $mymail = new PlMailer('register/success.mail.tpl');
+ $mymail->addTo("\"{$user->fullName()}\" <{$user->forlifeEmail()}>");
+ if ($isX) {
+ $mymail->setSubject('Bienvenue parmi les X sur le web !');
+ } else {
+ $mymail->setSubject('Bienvenue sur Polytechnique.org !');
+ }
$mymail->assign('forlife', $forlife);
- $mymail->assign('prenom', $prenom);
+ $mymail->assign('firstname', $firstname);
$mymail->send();
// Index the user, to allow her to appear in searches.
- require_once('user.func.inc.php');
- user_reindex($uid);
+ Profile::rebuildSearchTokens($pid);
// Notify other users which were watching for her arrival.
- require_once 'notifs.inc.php';
- register_watch_op($uid, WATCH_INSCR);
- inscription_notifs_base($uid);
+ XDB::execute('INSERT INTO contacts (uid, contact)
+ SELECT uid, ni_id
+ FROM watch_nonins
+ WHERE ni_id = {?}', $uid);
+ XDB::execute('DELETE FROM watch_nonins
+ WHERE ni_id = {?}', $uid);
+ Platal::session()->updateNbNotifs();
// Forcibly register the new user on default forums.
- $promo_forum = 'xorg.promo.x' . $promo;
- $registered_forums = array('xorg.general', 'xorg.pa.divers', 'xorg.pa.logements', $promo_forum);
- foreach ($registered_forums as $forum) {
- XDB::execute("INSERT INTO forums.abos (fid,uid)
+ $promoForum = 'xorg.promo.' . strtolower($promo);
+ $registeredForums = array('xorg.general', 'xorg.pa.divers', 'xorg.pa.logements', $promoForum);
+ foreach ($registeredForums as $forum) {
+ XDB::execute("INSERT INTO forum_subs (fid, uid)
SELECT fid, {?}
- FROM forums.list
- WHERE nom = {?}",
- $uid, $val);
+ FROM forums
+ WHERE name = {?}",
+ $uid, $val);
// Notify the newsgroup admin of the promotion forum needs be created.
- if (XDB::affectedRows() == 0 && $forum == $promo_forum) {
- $res = XDB::query("SELECT SUM(perms IN ('admin','user') AND deces = 0), COUNT(*)
- FROM auth_user_md5
- WHERE promo = {?}", $promo);
- list($promo_registered_count, $promo_count) = $res->fetchOneRow();
- if ($promo_registered_count > 0.2 * $promo_count) {
+ if (XDB::affectedRows() == 0 && $forum == $promoForum) {
+ $promoFull = new UserFilter(new UFC_Promo('=', UserFilter::DISPLAY, $promo));
+ $promoRegistered = new UserFilter(new PFC_And(
+ new UFC_Promo('=', UserFilter::DISPLAY, $promo),
+ new UFC_Registered(true),
+ new PFC_Not(new UFC_Dead())
+ ));
+ if ($promoRegistered->getTotalCount() > 0.2 * $promoFull->getTotalCount()) {
$mymail = new PlMailer('admin/forums-promo.mail.tpl');
$mymail->assign('promo', $promo);
$mymail->send();
@@ -369,72 +463,51 @@ class RegisterModule extends PLModule
// Update the global registration count stats.
$globals->updateNbIns();
- // 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);
-
//
// Update collateral data sources, and inform watchers by email.
//
// Email the referrer(s) of this new user.
- $res = XDB::iterRow(
- "SELECT sa.alias, IF(s.nom_usage,s.nom_usage,s.nom) AS nom,
- s.prenom, FIND_IN_SET('femme', s.flags) AS femme,
- GROUP_CONCAT(m.email SEPARATOR ', ') AS mails, MAX(m.last) AS dateDernier
- 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
- AND FIND_IN_SET('bestalias', sa.flags))
- WHERE m.uid = {?}
- GROUP BY m.sender
- ORDER BY dateDernier DESC", $uid);
+ $res = XDB::iterRow("SELECT sender, GROUP_CONCAT(email SEPARATOR ', ') AS mails, MAX(last) AS lastDate
+ FROM register_marketing
+ WHERE uid = {?}
+ GROUP BY sender
+ ORDER BY lastDate DESC", $uid);
XDB::execute("UPDATE register_mstats
SET success = NOW()
WHERE uid = {?}", $uid);
$market = array();
- while (list($salias, $snom, $sprenom, $sfemme, $mails, $dateDernier) = $res->next()) {
- $market[] = " - par $snom $sprenom sur $mails (le plus récemment le $dateDernier)";
- $mymail = new PlMailer();
- $mymail->setSubject("$prenom $nom s'est inscrit à Polytechnique.org !");
- $mymail->setFrom('"Marketing Polytechnique.org" mail->domain . '>');
- $mymail->addTo("\"$sprenom $snom\" <$salias@{$globals->mail->domain}>");
- $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"
- . "Merci de ta participation active à la reconnaissance de ce site !!!\n\n"
- . "Bien cordialement,\n"
- . "-- \n"
- . "L'équipe Polytechnique.org";
+ while (list($senderid, $maketingEmails, $lastDate) = $res->next()) {
+ $sender = User::getWithUID($senderid);
+ $market[] = " - par {$sender->fullName()} sur $maketingEmails (le plus récemment le $lastDate)";
+ $mymail = new PlMailer('register/marketer.mail.tpl');
+ $mymail->setSubject("$firstname $lastname s'est inscrit à Polytechnique.org !");
+ $mymail->addTo($sender);
+ $mymail->assign('sender', $sender);
+ $mymail->assign('firstname', $firstname);
+ $mymail->assign('lastname', $lastname);
+ $mymail->assign('promo', $promo);
+ $mymail->assign('sex', $sex);
$mymail->setTxtBody(wordwrap($msg, 72));
$mymail->send();
}
// Email the plat/al administrators about the registration.
if ($globals->register->notif) {
- $mymail = new PlMailer();
- $mymail->setSubject("Inscription de $prenom $nom (X$promo)");
- $mymail->setFrom('"Webmaster Polytechnique.org" mail->domain . '>');
- $mymail->addTo($globals->register->notif);
- $mymail->addHeader('Reply-To', $globals->register->notif);
- $msg = "$prenom $nom (X$promo) a terminé son inscription avec les données suivantes :\n"
- . " - nom : $nom\n"
- . " - prenom : $prenom\n"
- . " - promo : $promo\n"
- . " - naissance : $naissance (date connue : $naiss_ini)\n"
- . " - forlife : $forlife\n"
- . " - email : $email\n"
- . " - sexe : $femme\n"
- . " - ip : " . S::logger()->ip . " (" . S::logger()->host . ")\n"
- . (S::logger()->proxy_ip ? " - proxy : " . S::logger()->proxy_ip . " (" . S::logger()->proxy_host . ")\n" : "")
- . "\n\n";
+ $mymail = new PlMailer('register/registration.mail.tpl');
+ $mymail->setSubject("Inscription de $firstname $lastname ($promo)");
+ $mymail->assign('firstname', $firstname);
+ $mymail->assign('lastname', $lastname);
+ $mymail->assign('promo', $promo);
+ $mymail->assign('sex', $sex);
+ $mymail->assign('birthdate', $birthdate);
+ $mymail->assign('birthdate_ref', $birthdate_ref);
+ $mymail->assign('forlife', $forlife);
+ $mymail->assign('email', $email);
+ $mymail->assign('logger', S::logger());
if (count($market) > 0) {
- $msg .= "Les marketings suivants avaient été effectués :\n"
- . implode("\n", $market);
- } else {
- $msg .= "$prenom $nom n'a jamais reçu d'email de marketing.";
+ $mymail->assign('market', implode("\n", $market));
}
$mymail->setTxtBody($msg);
$mymail->send();