X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fregister.php;h=b2c4a3d967747aeda596cacb71a784e553a67368;hb=1dd218522cea6ae08998b0ca107c8fec608ddce8;hp=2b473aa6e00b8f5987e04d40c81c8ca212447371;hpb=07f1f7299fc01116d59d4072711b067e6194bd91;p=platal.git diff --git a/modules/register.php b/modules/register.php index 2b473aa..b2c4a3d 100644 --- 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,8 +369,8 @@ 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->subscribe("promo" . S::v('promo')); @@ -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(); @@ -455,7 +456,7 @@ class RegisterModule extends PLModule $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);