X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fregister.php;h=9a32e609de50568218e05acbdcd9645d090706e7;hb=460d8f5533ac4dff9d0df95efe11c399228b8637;hp=a0d27dc070389872f06b888715247376caa17b68;hpb=de08a5eb35a0daa5ea1817532f02367e0f0edbec;p=platal.git

diff --git a/modules/register.php b/modules/register.php
index a0d27dc..9a32e60 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'))) {
@@ -175,7 +176,7 @@ class RegisterModule extends PLModule
                         }
                     }
                     if ($sub_state['watch']) {
-                        $alter .= "Inscription d'un utilisateur surveillé - ";
+                        $alert .= "Inscription d'un utilisateur surveillé - ";
                     }
 
                     if (check_ip('unsafe')) {
@@ -214,7 +215,7 @@ 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');
@@ -317,7 +318,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;
@@ -336,7 +337,8 @@ class RegisterModule extends PLModule
              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();
@@ -379,7 +381,7 @@ class RegisterModule extends PLModule
                 $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.";
+                $msg .= "$prenom $nom n'a jamais reçu d\'email de marketing.";
             }
             $mymail->setTxtBody($msg);
             $mymail->send();