Merge commit 'origin/master' into fusionax

[platal.git] / modules / register.php

diff --git a/modules/register.php b/modules/register.php
index f2cd5e6..7e2d4bb 100644 (file)
--- a/modules/register.php
+++ b/modules/register.php
@@ -339,7 +339,7 @@ class RegisterModule extends PLModule
             switch ($service) {
                 case 'ax_letter':
                     Platal::load('axletter', 'axletter.inc.php');
-                    AXLetter::subscribe();
+                    AXLetter::subscribe(S::user()->id());
                     break;
                 case 'imap':
                     require_once 'emails.inc.php';
@@ -348,10 +348,10 @@ class RegisterModule extends PLModule
                     $storage->activate();
                     break;
                 case 'ml_promo':
-                    $r = XDB::query('SELECT id FROM groupex.asso WHERE diminutif = {?}', S::user()->promo());
+                    $r = XDB::query('SELECT id FROM #groupex#.asso WHERE diminutif = {?}', S::user()->promo());
                     if ($r->numRows()) {
                         $asso_id = $r->fetchOneCell();
-                        XDB::execute('REPLACE INTO  groupex.membres (uid, asso_id)
+                        XDB::execute('REPLACE INTO  #groupex#.membres (uid, asso_id)
                                             VALUES  ({?}, {?})',
                                      S::user()->id(), $asso_id);
                         $mmlist = new MMList(S::user()->id(), S::v('password'));
@@ -390,9 +390,9 @@ class RegisterModule extends PLModule
         $promo_forum = 'xorg.promo.x' . $promo;
         $registered_forums = array('xorg.general', 'xorg.pa.divers', 'xorg.pa.logements', $promo_forum);
         foreach ($registered_forums as $forum) {
-            XDB::execute("INSERT INTO  forums.abos (fid,uid)
+            XDB::execute("INSERT INTO  #forums#.abos (fid,uid)
                                SELECT  fid, {?}
-                                 FROM   forums.list
+                                 FROM  #forums#.list
                                 WHERE  nom = {?}",
                                 $uid, $val);
 
@@ -421,7 +421,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