= 3) {
@@ -204,7 +219,7 @@ class RegisterModule extends PLModule
}
$page->changeTpl('register/step'.intval($sub_state['step']).'.tpl');
if (isset($err)) {
- $page->trig($err);
+ $page->trigError($err);
}
}
@@ -217,22 +232,31 @@ class RegisterModule extends PLModule
{
global $globals;
+
$page->changeTpl('register/end.tpl');
$_SESSION['sub_state'] = array('step' => 5);
+
+ 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);
+ return PL_FORBIDDEN;
+ }
+
require_once('user.func.inc.php');
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, u.flags
+ 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);
}
if (!$hash || !list($uid, $forlife, $bestalias, $mailorg2, $password, $email,
- $naissance, $nom, $prenom, $promo, $femme) = $res->fetchOneRow())
+ $naissance, $nom, $prenom, $promo, $femme, $naiss_ini) = $res->fetchOneRow())
{
$page->kill("Cette adresse n'existe pas, ou plus, sur le serveur.
Causes probables :
@@ -289,7 +313,13 @@ class RegisterModule extends PLModule
$mymail->assign('prenom', $prenom);
$mymail->send();
- if (!start_connexion($uid,false)) {
+ require_once('user.func.inc.php');
+ user_reindex($uid);
+
+ // update number of subscribers (perms has changed)
+ update_NbIns();
+
+ if (!start_connexion($uid, false)) {
return PL_FORBIDDEN;
}
$_SESSION['auth'] = AUTH_MDP;
@@ -298,22 +328,26 @@ class RegisterModule extends PLModule
/************* envoi d'un mail au démarcheur ***************/
/***********************************************************/
$res = XDB::iterRow(
- "SELECT DISTINCT sa.alias, IF(s.nom_usage,s.nom_usage,s.nom) AS nom,
- s.prenom, FIND_IN_SET('femme', s.flags) AS femme
+ "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, 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 = {?}", $uid);
+ WHERE m.uid = {?}
+ GROUP BY m.sender", $uid);
XDB::execute("UPDATE register_mstats SET success=NOW() WHERE uid={?}", $uid);
- while (list($salias, $snom, $sprenom, $sfemme) = $res->next()) {
+ $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" ');
+ $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}), "
+ . "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"
@@ -322,24 +356,36 @@ class RegisterModule extends PLModule
$mymail->setTxtBody(wordwrap($msg, 72));
$mymail->send();
}
+
+ /**** send a mail to X.org administrators ****/
if ($globals->register->notif) {
$mymail = new PlMailer();
$mymail->setSubject("Inscription de $prenom $nom (X$promo)");
- $mymail->setFrom('"Webmaster Polytechnique.org" ');
+ $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\n"
+ . " - naissance : $naissance (date connue : $naiss_ini)\n"
. " - forlife : $forlife\n"
. " - email : $email\n"
- . " - sexe : $femme\n";
+ . " - sexe : $femme\n"
+ . " - ip : {$logger->ip} ({$logger->host})\n"
+ . ($logger->proxy_ip ? " - proxy : {$logger->proxy_ip} ({$logger->proxy_host})\n" : "")
+ . "\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();
+ $mymail->send();
}
- XDB::execute("DELETE FROM register_marketing WHERE uid = {?}", $uid);
+ Marketing::clear($uid);
pl_redirect('register/success');
$page->assign('uid', $uid);
@@ -347,6 +393,7 @@ class RegisterModule extends PLModule
function handler_success(&$page)
{
+ global $globals;
$page->changeTpl('register/success.tpl');
$_SESSION['sub_state'] = array('step' => 5);
@@ -357,7 +404,18 @@ class RegisterModule extends PLModule
WHERE user_id={?}', $password,
S::v('uid'));
- $log =& S::v('log');
+ // 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 (Cookie::v('ORGaccess')) {
@@ -368,8 +426,75 @@ class RegisterModule extends PLModule
$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')) {
+ require_once dirname(__FILE__) . '/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';
+ $storage = new EmailStorage(S::v('uid'), 'imap');
+ $storage->activate();
+ }
+
+ pl_redirect('profile/edit');
+ }
}
// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: