Merge remote branch 'origin/xorg/maint' into xorg/1.0.2/master

[platal.git] / modules / register.php

diff --git a/modules/register.php b/modules/register.php
index f2de6a3..c70a365 100644 (file)
--- a/modules/register.php
+++ b/modules/register.php
@@ -67,10 +67,11 @@ class RegisterModule extends PLModule
                 $subState->merge($res->fetchOneRow());
                 $subState->set('yearpromo', substr($subState->s('promo'), 1, 4));
 
-                XDB::execute('REPLACE INTO  register_mstats (uid,sender,success)
-                                    SELECT  m.uid, m.sender, 0
-                                      FROM  register_marketing AS m
-                                     WHERE  m.hash',
+                XDB::execute('INSERT INTO  register_mstats (uid, sender, success)
+                                   SELECT  m.uid, m.sender, 0
+                                     FROM  register_marketing AS m
+                                    WHERE  m.hash
+                  ON DUPLICATE KEY UPDATE  sender = VALUES(sender), success = VALUES(success)',
                              $subState->s('hash'));
             }
         }
@@ -368,10 +369,10 @@ class RegisterModule extends PLModule
                     $r = XDB::query('SELECT id FROM groups WHERE diminutif = {?}', $yearpromo);
                     if ($r->numRows()) {
                         $asso_id = $r->fetchOneCell();
-                        XDB::execute('REPLACE INTO  group_members (uid, asso_id)
-                                            VALUES  ({?}, {?})',
+                        XDB::execute('INSERT IGNORE INTO  group_members (uid, asso_id)
+                                                  VALUES  ({?}, {?})',
                                      $uid, $asso_id);
-                        $mmlist = new MMList($uid, S::v('password'));
+                        $mmlist = new MMList($user);
                         $mmlist->subscribe("promo" . S::v('promo'));
                     }
                     break;
@@ -398,10 +399,10 @@ class RegisterModule extends PLModule
         Profile::rebuildSearchTokens($pid);
 
         // Notify other users which were watching for her arrival.
-        XDB::execute('REPLACE INTO  contacts (uid, contact)
-                            SELECT  uid, ni_id
-                              FROM  watch_nonins
-                             WHERE  ni_id = {?}', $uid);
+        XDB::execute('INSERT INTO  contacts (uid, contact)
+                           SELECT  uid, ni_id
+                             FROM  watch_nonins
+                            WHERE  ni_id = {?}', $uid);
         XDB::execute('DELETE FROM  watch_nonins
                             WHERE  ni_id = {?}', $uid);
         Platal::session()->updateNbNotifs();
@@ -449,12 +450,13 @@ class RegisterModule extends PLModule
                          SET  success = NOW()
                        WHERE  uid = {?}", $uid);
 
+        $market = array();
         while (list($senderid, $maketingEmails, $lastDate) = $res->next()) {
             $sender = User::getWithUID($senderid);
-            $market[] = " - par $sender->fullName() sur $maketingEmails (le plus récemment le $lastDate)";
+            $market[] = " - par {$sender->fullName()} sur $maketingEmails (le plus récemment le $lastDate)";
             $mymail = new PlMailer('register/marketer.mail.tpl');
             $mymail->setSubject("$firstname $lastname s'est inscrit à Polytechnique.org !");
-            $mymail->addTo("\"$sender->fullName()\" <$sender->bestEmail()@{$globals->mail->domain}>");
+            $mymail->addTo($sender);
             $mymail->assign('sender', $sender);
             $mymail->assign('firstname', $firstname);
             $mymail->assign('lastname', $lastname);