Merge commit 'origin/fusionax' into account

[platal.git] / modules / register.php

diff --git a/modules/register.php b/modules/register.php
index 5680799..ba1ab62 100644 (file)
--- a/modules/register.php
+++ b/modules/register.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2008 Polytechnique.org                              *
+ *  Copyright (C) 2003-2009 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -344,10 +344,9 @@ class RegisterModule extends PLModule
         // update number of subscribers (perms has changed)
         $globals->updateNbIns();
 
-        if (!start_connexion($uid, false)) {
+        if (!Platal::session()->startWeakSession($uid)) {
             return PL_FORBIDDEN;
         }
-        $_SESSION['auth'] = AUTH_MDP;
 
         /***********************************************************/
         /************* envoi d'un mail au démarcheur ***************/
@@ -355,7 +354,7 @@ 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, MAX(m.last) AS dateDernier
+                         GROUP_CONCAT(m.email SEPARATOR ', ') 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
@@ -398,14 +397,14 @@ class RegisterModule extends PLModule
                  . " - 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" : "")
+                 . " - ip        : " . S::logger()->ip . " (" . S::logger()->host . ")\n"
+                 . (S::logger()->proxy_ip ? " - proxy     : " . S::logger()->proxy_ip . " (" . S::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 d\'email de marketing.";
+                $msg .= "$prenom $nom n'a jamais reçu d'email de marketing.";
             }
             $mymail->setTxtBody($msg);
             $mymail->send();
@@ -511,7 +510,8 @@ class RegisterModule extends PLModule
         }
         if (Post::v('imap')) {
             require_once 'emails.inc.php';
-            $storage = new EmailStorage(S::v('uid'), 'imap');
+            $user = S::user();
+            $storage = new EmailStorage($user, 'imap');
             $storage->activate();
         }