= 3) {
- $alert .= "Fin d'une inscription hésitante";
+ $alert .= "Fin d'une inscription hésitante.";
}
finish_ins($sub_state);
}
@@ -218,54 +256,48 @@ class RegisterModule extends PLModule
if (!empty($alert)) {
send_warning_mail($alert);
}
+
$page->changeTpl('register/step'.intval($sub_state['step']).'.tpl');
- if (isset($err)) {
- $page->trigError($err);
+ $page->addJsLink('motdepasse.js');
+ if (isset($error)) {
+ $page->trigError($error);
}
}
- function handler_end_old(&$page)
- {
- return $this->handler_end($page, Env::v('hash'));
- }
-
function handler_end(&$page, $hash = null)
{
global $globals;
-
-
- $page->changeTpl('register/end.tpl');
$_SESSION['sub_state'] = 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');
- XDB::execute('DELETE FROM register_pending
- WHERE hash = {?} AND hash != \'INSCRIT\'', $hash);
+ 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');
-
+ // /* TODO */
+ // 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,
+ r.password, r.email, r.services, 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);
+ WHERE hash = {?} AND hash != 'INSCRIT'", $hash);
}
-
- if (!$hash || !list($uid, $forlife, $bestalias, $mailorg2, $password, $email,
- $naissance, $nom, $prenom, $promo, $femme, $naiss_ini) = $res->fetchOneRow())
- {
+ if (!$hash || $res->numRows() == 0) {
$page->kill("Cette adresse n'existe pas, ou plus, sur le serveur.
- Causes probables :
+ Causes probables :
- Vérifie que tu visites l'adresse du dernier
- e-mail reçu s'il y en a eu plusieurs.
+ email reçu s'il y en a eu plusieurs.
- Tu as peut-être mal copié l'adresse reçue par
- mail, vérifie-la à la main.
+ email, vérifie-la à la main.
- Tu as peut-être attendu trop longtemps pour
confirmer. Les pré-inscriptions sont annulées
tous les 30 jours.
@@ -273,65 +305,124 @@ class RegisterModule extends PLModule
");
}
+ list($uid, $forlife, $bestalias, $mailorg2, $password, $email, $services,
+ $naissance, $nom, $prenom, $promo, $femme, $naiss_ini) = $res->fetchOneRow();
+ // 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);
+
+ // 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) {
+ $page->trigError("Mot de passe invalide.");
+ S::logger($uid)->log('auth_fail', 'bad password (register/end)');
+ return;
+ }
+ } else {
+ return;
+ }
- /***********************************************************/
- /****************** REALLY CREATE 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);
+ //
+ // 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 (uid, alias, type)
+ VALUES ({?}, {?}, 'a_vie')", $uid, $forlife);
+ XDB::execute("INSERT INTO aliases (uid, alias, type, flags)
+ VALUES ({?}, {?}, 'alias', 'bestalias')", $uid, $bestalias);
if ($mailorg2) {
- XDB::execute('INSERT INTO aliases (id,alias,type)
- VALUES ({?}, {?}, "alias")', $uid,
- $mailorg2);
+ XDB::execute("INSERT INTO aliases (uid, alias, type)
+ VALUES ({?}, {?}, 'alias')", $uid, $mailorg2);
}
- require_once('emails.inc.php');
+ // Add the registration email address as first and only redirection.
+ require_once 'emails.inc.php';
$user = User::getSilent($uid);
$redirect = new Redirect($user);
$redirect->add_email($email);
- // on cree un objet logger et on log l'inscription
- S::logger($uid)->log('inscription', $email);
- XDB::execute('UPDATE register_pending SET hash="INSCRIT" WHERE uid={?}', $uid);
+ // 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) {
+ switch ($service) {
+ case 'ax_letter':
+ Platal::load('axletter', 'axletter.inc.php');
+ AXLetter::subscribe(S::user()->id());
+ break;
+ case 'imap':
+ $user = S::user();
+ $storage = new EmailStorage($user, 'imap');
+ $storage->activate();
+ break;
+ case 'ml_promo':
+ $r = XDB::query('SELECT id FROM groups WHERE diminutif = {?}', S::user()->promo());
+ if ($r->numRows()) {
+ $asso_id = $r->fetchOneCell();
+ XDB::execute('REPLACE INTO group_members (uid, asso_id)
+ VALUES ({?}, {?})',
+ S::user()->id(), $asso_id);
+ $mmlist = new MMList(S::user()->id(), S::v('password'));
+ $mmlist->subscribe("promo" . S::v('promo'));
+ }
+ break;
+ case 'nl':
+ require_once 'newsletter.inc.php';
+ NewsLetter::subscribe();
+ break;
+ }
+ }
+ // Log the registration in the user session.
+ S::logger($uid)->log('inscription', $email);
+ XDB::execute("UPDATE register_pending
+ SET hash = 'INSCRIT'
+ WHERE uid = {?}", $uid);
+ // Congratulate our newly registered user by email.
$mymail = new PlMailer('register/inscription.reussie.tpl');
$mymail->assign('forlife', $forlife);
$mymail->assign('prenom', $prenom);
$mymail->send();
- // Enable search on the user
- require_once('user.func.inc.php');
- user_reindex($uid);
+ // Index the user, to allow her to appear in searches.
+ Profile::rebuildSearchTokens($uid);
- // Add notification for people looking for this registration
+ // Notify other users which were watching for her arrival.
require_once 'notifs.inc.php';
register_watch_op($uid, WATCH_INSCR);
inscription_notifs_base($uid);
- // Default registration on forums
- $p_for = 'xorg.promo.x' . $promo;
- $cible = array('xorg.general', 'xorg.pa.divers', 'xorg.pa.logements', $p_for);
- foreach ($cible as $val) {
- XDB::execute("INSERT INTO forums.abos (fid,uid)
- SELECT fid, {?} FROM forums.list WHERE nom={?}", $uid, $val);
- if (XDB::affectedRows() == 0 && $val == $p_for) {
+ // 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)
+ SELECT fid, {?}
+ FROM #forums#.list
+ WHERE nom = {?}",
+ $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($effau, $effid) = $res->fetchOneRow();
- if (5 * $effau > $effid) { // +
+ list($promo_registered_count, $promo_count) = $res->fetchOneRow();
+ if ($promo_registered_count > 0.2 * $promo_count) {
$mymail = new PlMailer('admin/forums-promo.mail.tpl');
$mymail->assign('promo', $promo);
$mymail->send();
@@ -339,28 +430,28 @@ class RegisterModule extends PLModule
}
}
- // update number of subscribers (perms has changed)
+ // Update the global registration count stats.
$globals->updateNbIns();
- if (!Platal::session()->startWeakSession($uid)) {
- return PL_FORBIDDEN;
- }
+ //
+ // Update collateral data sources, and inform watchers by email.
+ //
- /***********************************************************/
- /************* envoi d'un mail au démarcheur ***************/
- /***********************************************************/
+ // 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) )
+ INNER JOIN auth_user_md5 AS s ON (m.sender = s.user_id)
+ INNER JOIN aliases AS sa ON (sa.uid = m.sender
+ AND FIND_IN_SET('bestalias', sa.flags))
WHERE m.uid = {?}
GROUP BY m.sender
ORDER BY dateDernier DESC", $uid);
- XDB::execute("UPDATE register_mstats SET success=NOW() WHERE uid={?}", $uid);
+ XDB::execute("UPDATE register_mstats
+ SET success = NOW()
+ WHERE uid = {?}", $uid);
$market = array();
while (list($salias, $snom, $sprenom, $sfemme, $mails, $dateDernier) = $res->next()) {
@@ -375,12 +466,13 @@ class RegisterModule extends PLModule
. "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";
$mymail->setTxtBody(wordwrap($msg, 72));
$mymail->send();
}
- /**** send a mail to X.org administrators ****/
+ // Email the plat/al administrators about the registration.
if ($globals->register->notif) {
$mymail = new PlMailer();
$mymail->setSubject("Inscription de $prenom $nom (X$promo)");
@@ -408,111 +500,9 @@ class RegisterModule extends PLModule
$mymail->send();
}
+ // Remove old pending marketing requests for the new user.
Marketing::clear($uid);
- pl_redirect('register/success');
- $page->assign('uid', $uid);
- }
-
- function handler_success(&$page)
- {
- global $globals;
- $page->changeTpl('register/success.tpl');
- $page->assign('user', S::user());
-
- $_SESSION['sub_state'] = array('step' => 5);
- if (Env::has('response2')) {
- $_SESSION['password'] = $password = Post::v('response2');
-
- XDB::execute('UPDATE auth_user_md5 SET password={?}
- WHERE user_id={?}', $password,
- S::v('uid'));
-
- // If GoogleApps is enabled, and the user did choose to use synchronized passwords,
- // and if the (stupid) user has decided to use /register/success another time,
- // updates the Google Apps password as well.
- if ($globals->mailstorage->googleapps_domain) {
- require_once 'googleapps.inc.php';
- $account = new GoogleAppsAccount(S::user());
- if ($account->active() && $account->sync_password) {
- $account->set_password($password);
- }
- }
-
- S::logger()->log('passwd');
- Platal::session()->setAccessCookie(true);
-
- $page->assign('mdpok', true);
- }
-
- $res = XDB::iterRow("SELECT sub, domain
- FROM register_subs
- WHERE uid = {?} AND type = 'list'
- ORDER BY domain",
- S::i('uid'));
- $current_domain = null;
- $lists = array();
- while (list($sub, $domain) = $res->next()) {
- if ($current_domain != $domain) {
- $current_domain = $domain;
- $client = new MMList(S::v('uid'), S::v('password'), $domain);
- }
- list($details, ) = $client->get_members($sub);
- $lists["$sub@$domain"] = $details;
- }
- $page->assign_by_ref('lists', $lists);
-
- $page->addJsLink('motdepasse.js');
- }
-
- function handler_save(&$page)
- {
- global $globals;
-
- // Finish registration procedure
- if (Post::v('register_from_ax_question')) {
- XDB::execute('UPDATE auth_user_quick
- SET profile_from_ax = 1
- WHERE user_id = {?}',
- S::v('uid'));
- }
- if (Post::v('add_to_nl')) {
- require_once 'newsletter.inc.php';
- NewsLetter::subscribe();
- }
- if (Post::v('add_to_ax')) {
- Platal::load('axletter', 'axletter.inc.php');
- AXLetter::subscribe();
- }
- if (Post::v('add_to_promo')) {
- $r = XDB::query('SELECT id FROM groupex.asso WHERE diminutif = {?}',
- S::v('promo'));
- $asso_id = $r->fetchOneCell();
- XDB::execute('REPLACE INTO groupex.membres (uid,asso_id)
- VALUES ({?}, {?})',
- S::v('uid'), $asso_id);
- $mmlist = new MMList(S::v('uid'), S::v('password'));
- $mmlist->subscribe("promo".S::v('promo'));
- }
- if (Post::v('sub_ml')) {
- $subs = array_keys(Post::v('sub_ml'));
- $current_domain = null;
- foreach ($subs as $list) {
- list($sub, $domain) = explode('@', $list);
- if ($domain != $current_domain) {
- $current_domain = $domain;
- $client = new MMList(S::v('uid'), S::v('password'), $domain);
- }
- $client->subscribe($sub);
- }
- }
- if (Post::v('imap')) {
- require_once 'emails.inc.php';
- $user = S::user();
- $storage = new EmailStorage($user, 'imap');
- $storage->activate();
- }
-
pl_redirect('profile/edit');
}
}