= 3) {
+ $alert .= "Fin d'une inscription hésitante";
+ }
+ finish_ins($sub_state);
+ }
}
}
break;
}
$_SESSION['sub_state'] = $sub_state;
+ if ($alert) {
+ send_warning_mail($alert);
+ }
$page->changeTpl('register/step'.intval($sub_state['step']).'.tpl');
- $page->assign('simple', true);
if (isset($err)) {
- $page->trig($err);
+ $page->trigError($err);
}
}
function handler_end_old(&$page)
{
- return $this->handler_end($page, Env::get('hash'));
+ 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);
+
+ 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 = $globals->xdb->query(
+ $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 :
- - Vérifie que tu visites l'adresse du dernier
- e-mail 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.
- - Tu as peut-être attendu trop longtemps pour
- confirmer. Les pré-inscriptions sont annulées
+
- Vérifie que tu visites l'adresse du dernier
+ e-mail 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.
+ - Tu as peut-être attendu trop longtemps pour
+ confirmer. Les pré-inscriptions sont annulées
tous les 30 jours.
- - Tu es en fait déjà inscrit.
+ - Tu es en fait déjà inscrit.
");
}
@@ -201,19 +278,19 @@ class RegisterModule extends PLModule
/****************** REALLY CREATE ACCOUNT ******************/
/***********************************************************/
- $globals->xdb->execute('UPDATE auth_user_md5
+ XDB::execute('UPDATE auth_user_md5
SET password={?}, perms="user",
date=NOW(), naissance={?}, date_ins = NOW()
WHERE user_id={?}', $password, $naissance, $uid);
- $globals->xdb->execute('REPLACE INTO auth_user_quick (user_id) VALUES ({?})', $uid);
- $globals->xdb->execute('INSERT INTO aliases (id,alias,type)
+ XDB::execute('REPLACE INTO auth_user_quick (user_id) VALUES ({?})', $uid);
+ XDB::execute('INSERT INTO aliases (id,alias,type)
VALUES ({?}, {?}, "a_vie")', $uid,
$forlife);
- $globals->xdb->execute('INSERT INTO aliases (id,alias,type,flags)
+ XDB::execute('INSERT INTO aliases (id,alias,type,flags)
VALUES ({?}, {?}, "alias", "bestalias")',
$uid, $bestalias);
if ($mailorg2) {
- $globals->xdb->execute('INSERT INTO aliases (id,alias,type)
+ XDB::execute('INSERT INTO aliases (id,alias,type)
VALUES ({?}, {?}, "alias")', $uid,
$mailorg2);
}
@@ -223,75 +300,125 @@ class RegisterModule extends PLModule
$redirect->add_email($email);
// on cree un objet logger et on log l'inscription
- $logger = new DiogenesCoreLogger($uid);
+ $logger = new CoreLogger($uid);
$logger->log('inscription', $email);
- $globals->xdb->execute('UPDATE register_pending SET hash="INSCRIT" WHERE uid={?}', $uid);
+ XDB::execute('UPDATE register_pending SET hash="INSCRIT" WHERE uid={?}', $uid);
- $globals->hook->subscribe($forlife, $uid, $promo, $password);
+ global $platal;
+ $platal->on_subscribe($forlife, $uid, $promo, $password);
- require_once('xorg.mailer.inc.php');
- $mymail = new XOrgMailer('register/inscription.reussie.tpl');
+ $mymail = new PlMailer('register/inscription.reussie.tpl');
$mymail->assign('forlife', $forlife);
$mymail->assign('prenom', $prenom);
$mymail->send();
- 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;
/***********************************************************/
- /************* envoi d'un mail au démarcheur ***************/
+ /************* envoi d'un mail au démarcheur ***************/
/***********************************************************/
- $res = $globals->xdb->iterRow(
- "SELECT DISTINCT sa.alias, IF(s.nom_usage,s.nom_usage,s.nom) AS nom,
- s.prenom, s.flags AS femme
+ $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, 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);
- $globals->xdb->execute("UPDATE register_mstats SET success=NOW() WHERE uid={?}", $uid);
-
- while (list($salias, $snom, $sprenom, $sfemme) = $res->next()) {
- require_once('diogenes/diogenes.hermes.inc.php');
- $mymail = new HermesMailer();
- $mymail->setSubject("$prenom $nom s'est inscrit à Polytechnique.org !");
- $mymail->setFrom('"Marketing Polytechnique.org" ');
+ WHERE m.uid = {?}
+ GROUP BY m.sender", $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?'Cher':'Chère')." $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"
+ $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"
- . "L'équipe Polytechnique.org";
+ . "L'équipe Polytechnique.org";
$mymail->setTxtBody(wordwrap($msg, 72));
$mymail->send();
}
- $globals->xdb->execute("DELETE FROM register_marketing WHERE uid = {?}", $uid);
+ /**** 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" 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 : {$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();
+ }
- redirect($globals->baseurl.'/register/success');
+ Marketing::clear($uid);
+
+ pl_redirect('register/success');
$page->assign('uid', $uid);
}
function handler_success(&$page)
{
global $globals;
-
$page->changeTpl('register/success.tpl');
+ $_SESSION['sub_state'] = array('step' => 5);
if (Env::has('response2')) {
- $_SESSION['password'] = $password = Post::get('response2');
+ $_SESSION['password'] = $password = Post::v('response2');
- $globals->xdb->execute('UPDATE auth_user_md5 SET password={?}
+ XDB::execute('UPDATE auth_user_md5 SET password={?}
WHERE user_id={?}', $password,
- Session::getInt('uid'));
+ 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);
+ }
+ }
- $log =& Session::getMixed('log');
+ $log = S::v('log');
$log->log('passwd', '');
- if (Cookie::get('ORGaccess')) {
+ if (Cookie::v('ORGaccess')) {
require_once('secure_hash.inc.php');
setcookie('ORGaccess', hash_encrypt($password), (time()+25920000), '/', '' ,0);
}
@@ -299,8 +426,76 @@ class RegisterModule extends PLModule
$page->assign('mdpok', true);
}
- $page->addJsLink('javascript/motdepasse.js');
+ $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:
?>