}
// Check if the given email is known as dangerous
- $res = Xdb::iterRow("SELECT w.state, w.description, a.alias
- FROM emails AS e
- INNER JOIN emails_watch AS w ON (e.email = w.email AND w.state != 'safe')
- INNER JOIN aliases AS a ON (e.uid = a.id AND a.type = 'a_vie')
- WHERE e.email = {?}
- ORDER BY a.alias", Post::v('email'));
- $aliases = array();
- while(list($gstate, $gdescription, $alias) = $res->next()) {
- $state = $gstate;
- $description = $gdescription;
- $aliases[] = $alias;
- }
- if (count($aliases) != 0) {
+ $res = XDB::query("SELECT w.state, w.description
+ FROM emails_watch AS w
+ WHERE w.email = {?} AND w.state != 'safe'",
+ Post::v('email'));
+ $email_banned = false;
+ if ($res->numRows()) {
+ list($state, $description) = $res->fetchOneRow();
$alert .= "Email surveille propose a l'inscription - ";
+ $sub_state['email_desc'] = $description;
+ if ($state == 'dangerous') {
+ $email_banned = true;
+ }
}
if ($sub_state['watch']) {
$alter .= "Inscription d'un utilisateur surveillé - ";
$alert .= "Date de naissance incorrecte à l'inscription - ";
}
$sub_state['email'] = Post::v('email');
- if (check_ip('unsafe')) {
+ $ip_banned = check_ip('unsafe');
+ if ($ip_banned) {
+ $alert .= "Tentative d'inscription depuis une IP surveillee";
+ }
+ if ($email_banned || $ip_banned) {
+ global $globals;
$err = "Une erreur s'est produite lors de l'inscription."
. " Merci de contacter <a href='mailto:register@{$globals->mail->domain}>"
. " register@{$globals->mail->domain}</a>"
. " pour nous faire part de cette erreur";
- $alert .= "Tentative d'inscription depuis une IP surveillee";
} else {
$sub_state['step'] = 4;
if (count($sub_state['backs']) >= 3) {
}
$page->changeTpl('register/step'.intval($sub_state['step']).'.tpl');
if (isset($err)) {
- $page->trig($err);
+ $page->trigError($err);
}
}
$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) AS mails
+ GROUP_CONCAT(m.email) 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
XDB::execute("UPDATE register_mstats SET success=NOW() WHERE uid={?}", $uid);
$market = array();
- while (list($salias, $snom, $sprenom, $sfemme, $mails) = $res->next()) {
- $market[] = " - par $snom $sprenom sur $mails";
+ 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" <register@' . $globals->mail->domain . '>');
$mymail->setSubject("Inscription de $prenom $nom (X$promo)");
$mymail->setFrom('"Webmaster Polytechnique.org" <web@' . $globals->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"
. " - sexe : $femme\n"
. " - ip : {$logger->ip} ({$logger->host})\n"
. ($logger->proxy_ip ? " - proxy : {$logger->proxy_ip} ({$logger->proxy_host})\n" : "")
- . "\n\n"
- . "Les marketings suivants avaient été effectués :\n"
- . implode("\n", $market);
+ . "\n\n";
+ 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 de mail de marketing.";
+ }
$mymail->setTxtBody($msg);
$mymail->send();
}
function handler_success(&$page)
{
+ global $globals;
$page->changeTpl('register/success.tpl');
$_SESSION['sub_state'] = array('step' => 5);
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 user /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::v('uid'), S::v('forlife'));
+ if ($account->active() && $account->sync_password) {
+ $account->set_password($password);
+ }
+ }
+
$log = S::v('log');
$log->log('passwd', '');
}
if (Post::v('imap')) {
require_once 'emails.inc.php';
- $storage = new MailStorageIMAP(S::v('uid'));
- $storage->enable();
+ $storage = new EmailStorage(S::v('uid'), 'imap');
+ $storage->activate();
}
pl_redirect('profile/edit');