X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fregister.php;h=2fdcdd9977c15d16da499f7f21d3695594e28c72;hb=12a587df92f7bc9efeb91c1a2d27f763070b8609;hp=6d1da670f6b91183b877c5762942dba39abb03d6;hpb=b9fe731c528c8018002cb98b7d442acff611c710;p=platal.git diff --git a/modules/register.php b/modules/register.php index 6d1da67..2fdcdd9 100644 --- a/modules/register.php +++ b/modules/register.php @@ -83,13 +83,13 @@ class RegisterModule extends PLModule switch ($sub_state['step']) { case 0: - require_once('wiki.inc.php'); - wiki_require_page('Reference.Charte'); + $wp = new PlWikiPage('Reference.Charte'); + $wp->buildCache(); if (Post::has('step1')) { $sub_state['step'] = 1; if (isset($sub_state['hash'])) { $sub_state['step'] = 3; - require_once(dirname(__FILE__) . '/register/register.inc.php'); + $this->load('register.inc.php'); create_aliases($sub_state); } } @@ -119,7 +119,7 @@ class RegisterModule extends PLModule case 2: if (count($_POST)) { - require_once(dirname(__FILE__) . '/register/register.inc.php'); + $this->load('register.inc.php'); $sub_state['prenom'] = Post::v('prenom'); $sub_state['nom'] = Post::v('nom'); $sub_state['mat'] = Post::v('mat'); @@ -136,7 +136,8 @@ class RegisterModule extends PLModule case 3: if (count($_POST)) { - require_once(dirname(__FILE__) . '/register/register.inc.php'); + $this->load('register.inc.php'); + require_once 'emails.inc.php'; if (!isvalid_email(Post::v('email'))) { $err[] = "Le champ 'E-mail' n'est pas valide."; } elseif (!isvalid_email_redirection(Post::v('email'))) { @@ -161,23 +162,21 @@ class RegisterModule extends PLModule } // 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 .= "Inscription d'un utilisateur surveillé - "; } if (check_ip('unsafe')) { @@ -193,12 +192,16 @@ class RegisterModule extends PLModule $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 = 3) { @@ -212,12 +215,12 @@ class RegisterModule extends PLModule } $_SESSION['sub_state'] = $sub_state; - if ($alert) { + if (!empty($alert)) { send_warning_mail($alert); } $page->changeTpl('register/step'.intval($sub_state['step']).'.tpl'); if (isset($err)) { - $page->trig($err); + $page->trigError($err); } } @@ -294,12 +297,13 @@ class RegisterModule extends PLModule } require_once('emails.inc.php'); - $redirect = new Redirect($uid); + $user = User::getSilent($uid); + $redirect = new Redirect($user); $redirect->add_email($email); // on cree un objet logger et on log l'inscription - $logger = new CoreLogger($uid); - $logger->log('inscription', $email); + $logger = new PlLogger($uid); + S::logger()->log('inscription', $email); XDB::execute('UPDATE register_pending SET hash="INSCRIT" WHERE uid={?}', $uid); @@ -315,7 +319,7 @@ class RegisterModule extends PLModule user_reindex($uid); // update number of subscribers (perms has changed) - update_NbIns(); + $globals->updateNbIns(); if (!start_connexion($uid, false)) { return PL_FORBIDDEN; @@ -328,18 +332,19 @@ class RegisterModule extends PLModule $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 AND FIND_IN_SET('bestalias', sa.flags) ) WHERE m.uid = {?} - GROUP BY m.sender", $uid); + GROUP BY m.sender + ORDER BY dateDernier DESC", $uid); 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" mail->domain . '>'); @@ -361,6 +366,7 @@ class RegisterModule extends PLModule $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" @@ -371,9 +377,13 @@ class RegisterModule extends PLModule . " - 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 d\'email de marketing."; + } $mymail->setTxtBody($msg); $mymail->send(); } @@ -386,6 +396,7 @@ class RegisterModule extends PLModule function handler_success(&$page) { + global $globals; $page->changeTpl('register/success.tpl'); $_SESSION['sub_state'] = array('step' => 5); @@ -396,8 +407,19 @@ class RegisterModule extends PLModule 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); + } + } + $log = S::v('log'); - $log->log('passwd', ''); + S::logger()->log('passwd', ''); if (Cookie::v('ORGaccess')) { require_once('secure_hash.inc.php'); @@ -443,7 +465,7 @@ class RegisterModule extends PLModule NewsLetter::subscribe(); } if (Post::v('add_to_ax')) { - require_once dirname(__FILE__) . '/axletter/axletter.inc.php'; + Platal::load('axletter', 'axletter.inc.php'); AXLetter::subscribe(); } if (Post::v('add_to_promo')) { @@ -470,8 +492,8 @@ class RegisterModule extends PLModule } 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');