Merge branch 'master' into hruid

[platal.git] / modules / register.php

diff --git a/modules/register.php b/modules/register.php
index 2820841..c0a7cce 100644 (file)
--- a/modules/register.php
+++ b/modules/register.php
@@ -83,8 +83,8 @@ 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'])) {
@@ -161,23 +161,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 +191,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 <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) {
@@ -212,12 +214,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);
         }
     }
 
@@ -298,8 +300,8 @@ class RegisterModule extends PLModule
         $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 +317,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;
@@ -361,6 +363,7 @@ class RegisterModule extends PLModule
             $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"
@@ -371,9 +374,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 de mail de marketing.";
+            }
             $mymail->setTxtBody($msg);
             $mymail->send();
         }
@@ -398,18 +405,18 @@ class RegisterModule extends PLModule
                                    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,
+            // 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::v('uid'), S::v('forlife'));
+                $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');
@@ -482,8 +489,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');