<?php
/***************************************************************************
- * Copyright (C) 2003-2011 Polytechnique.org *
+ * Copyright (C) 2003-2014 Polytechnique.org *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
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);
$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) {
- $nameTypes = DirEnum::getOptions(DirEnum::NAMETYPES);
- $nameTypes = array_flip($nameTypes);
- $res = XDB::query("SELECT a.uid, a.hruid, pnl.name AS lastname, pnf.name AS firstname, p.xorg_id AS xorgid,
+ $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))
INNER JOIN profile_display AS pd ON (p.pid = pd.pid)
INNER JOIN profile_education AS pe ON (pe.pid = p.pid AND FIND_IN_SET('primary', pe.flags))
INNER JOIN profile_education_degree_enum AS pde ON (pde.id = pe.degreeid)
- 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_public_names AS ppn ON (ppn.pid = p.pid)
WHERE m.hash = {?} AND a.state = 'pending'",
- $nameTypes['name_ini'], $nameTypes['firstname_ini'], $hash);
+ $hash);
if ($res->numRows() == 1) {
$subState->merge($res->fetchOneRow());
// 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.';
}
$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);
}
}
// 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;
}
$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'))) {
// 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.
} 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);
}
}
$_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');
return PL_FORBIDDEN;
}
- $nameTypes = DirEnum::getOptions(DirEnum::NAMETYPES);
- $nameTypes = array_flip($nameTypes);
-
// Retrieve the pre-registration information using the url-provided
// authentication token.
$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, pe.promo_year AS yearpromo,
- pd.promo, p.sex, p.birthdate_ref, a.type AS eduType
+ ppn.lastname_initial, ppn.firstname_initial, pe.promo_year,
+ 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))
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_public_names AS ppn ON (ppn.pid = p.pid)
INNER JOIN profile_display AS pd ON (p.pid = pd.pid)
INNER JOIN profile_education AS pe ON (pe.pid = p.pid AND FIND_IN_SET('primary', pe.flags))
WHERE hash = {?} AND hash != 'INSCRIT' AND a.state = 'pending'",
- $nameTypes['name_ini'], $nameTypes['firstname_ini'], $hash);
+ $hash);
if (!$hash || $res->numRows() == 0) {
$page->kill("<p>Cette adresse n'existe pas, ou plus, sur le serveur.</p>
<p>Causes probables :</p>
}
list($uid, $pid, $forlife, $bestalias, $emailXorg2, $password, $email, $services,
- $birthdate, $lastname, $firstname, $promo, $sex, $birthdate_ref, $eduType) = $res->fetchOneRow();
- $isX = ($eduType == 'x');
- // We need the expected promotion here. Thus we remove pending display.
- $promo = str_replace(' (en cours)', $yearpromo, $promo);
- $mail_domain = User::$sub_mail_domains[$eduType] . $globals->mail->domain;
+ $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;
// Prepare the template for display.
$page->changeTpl('register/end.tpl');
}
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);
$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);
+ 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());
+ }
// Subscribe the user to the services she did request at registration time.
+ require_once 'newsletter.inc.php';
foreach (explode(',', $services) as $service) {
- require_once 'newsletter.inc.php';
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;
case 'imap':
- Email::activate_storage($user, 'imap');
+ Email::activate_storage($user, 'imap', Bogo::IMAP_DEFAULT);
break;
case 'ml_promo':
if ($isX) {
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.");
// 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();
// Forcibly register the new user on default forums.
- $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
- WHERE name = {?}",
- $uid, $val);
+ $registeredForums = array('xorg.general', 'xorg.pa.divers', 'xorg.pa.logements');
- // Notify the newsgroup admin of the promotion forum needs be created.
- if (XDB::affectedRows() == 0 && $forum == $promoForum) {
+ if ($isX) {
+ $promoForum = 'xorg.promo.' . strtolower($promo);
+ $exists = XDB::fetchOneCell('SELECT COUNT(*)
+ FROM forums
+ WHERE name = {?}',
+ $promoForum);
+
+ if ($exists == 0) {
+ // Notify the newsgroup admin of the promotion forum needs be created.
$promoFull = new UserFilter(new UFC_Promo('=', UserFilter::DISPLAY, $promo));
$promoRegistered = new UserFilter(new PFC_And(
new UFC_Promo('=', UserFilter::DISPLAY, $promo),
$mymail->assign('promo', $promo);
$mymail->send();
}
+ } else {
+ $registeredForums[] = $promoForum;
}
}
+ foreach ($registeredForums as $forum) {
+ XDB::execute("INSERT INTO forum_subs (fid, uid)
+ SELECT fid, {?}
+ FROM forums
+ WHERE name = {?}",
+ $uid, $val);
+ }
+
// Update the global registration count stats.
$globals->updateNbIns();
$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->setTo($sender);
$mymail->assign('sender', $sender);
$mymail->assign('firstname', $firstname);
$mymail->assign('lastname', $lastname);
}
}
-// 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:
?>
projects / platal.git / blobdiff