X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fregister.php;h=dab11ebbdf74e21a2201bbc4987b5ebc7776d1db;hb=043bbacf7d5ceaeba4db582ac0ea7c75d6f13c80;hp=04f4ffc2c2079661fb2202e6ed187fd6cee78071;hpb=63f06a435ff8e9c058b1dee1eb97fff99606d490;p=platal.git

diff --git a/modules/register.php b/modules/register.php
index 04f4ffc..dab11eb 100644
--- 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'])) {
@@ -137,6 +137,7 @@ class RegisterModule extends PLModule
             case 3:
                 if (count($_POST)) {
                     require_once(dirname(__FILE__) . '/register/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'))) {
@@ -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();