X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fregister%2Fregister.inc.php;h=993ead3446eca8923e21e00384c730c8a582ee26;hb=73317355964c4cd538157f8b281a1384b7e38e4d;hp=1ccb04176fadf37b904a78cb177b3c928a25a6bb;hpb=e22ff176d83e1f4ffd866e6ad928ee247906c6a5;p=platal.git diff --git a/modules/register/register.inc.php b/modules/register/register.inc.php index 1ccb041..993ead3 100644 --- a/modules/register/register.inc.php +++ b/modules/register/register.inc.php @@ -1,6 +1,6 @@ t('firstname'), $subState->t('lastname')); $suffix = (User::$sub_mail_domains[$type] ? substr(User::$sub_mail_domains[$type], 0, 1) : '') . substr($subState->v('yearpromo'), -2); $emailXorg2 = $emailXorg . '.' . $suffix; + // Search for homonyms: + // * first case: only one homonym already registered. $res = XDB::query('SELECT uid, expire FROM email_source_account WHERE email = {?} AND type != \'alias_aux\'', $emailXorg); - if ($res->numRows()) { - list($h_id, $expire) = $res->fetchOneRow(); - if (empty($expire)) { - XDB::execute('UPDATE email_source_account - SET expire = ADDDATE(NOW(), INTERVAL 1 MONTH) - WHERE email = {?} AND type != \'alias_aux\'', + // * second case: at least two homonyms registerd. + $result = XDB::query("SELECT hrmid + FROM email_source_other + WHERE type = 'homonym' AND email = {?}", $emailXorg); - $hrmid = User::makeHomonymHrmid($emailXorg); + if ($res->numRows() || $result->numRows()) { + if ($res->numRows()) { + list($h_id, $expire) = $res->fetchOneRow(); + if (empty($expire)) { + XDB::execute('UPDATE email_source_account + SET expire = ADDDATE(NOW(), INTERVAL 1 MONTH) + WHERE email = {?} AND type != \'alias_aux\'', + $emailXorg); + $hrmid = User::makeHomonymHrmid($emailXorg); + XDB::execute('INSERT IGNORE INTO homonyms_list (hrmid, uid) + VALUES ({?}, {?}), ({?}, {?})', + $hrmid, $h_id, $hrmid, $subState->i('uid')); + $als = XDB::fetchColumn('SELECT email + FROM email_source_account + WHERE uid = {?} AND type != \'alias_aux\' AND expire IS NULL', + $h_id); + + $homonym = User::getSilentWithUID($h_id); + $mailer = new PlMailer('register/lostalias.mail.tpl'); + $mailer->addTo($homonym); + $mailer->setSubject("Perte de ton alias $emailXorg dans un mois !"); + $mailer->assign('emailXorg', $emailXorg); + $mailer->assign('als', join(', ', $als)); + $mailer->SetTxtBody(wordwrap($msg,72)); + $mailer->send(); + } + } else { + $hrmid = $result->fetchOneCell(); XDB::execute('INSERT IGNORE INTO homonyms_list (hrmid, uid) - VALUES ({?}, {?}), ({?}, {?})', - $hrmid, $h_id, $hrmid, $subState->i('uid')); - $als = XDB::fetchColumn('SELECT email - FROM email_source_account - WHERE uid = {?} AND type != \'alias_aux\' AND expire IS NULL', - $h_id); - - $homonym = User::getSilentWithUID($h_id); - $mailer = new PlMailer('register/lostalias.mail.tpl'); - $mailer->addTo($homonym); - $mailer->setSubject("Perte de ton alias $emailXorg dans un mois !"); - $mailer->assign('emailXorg', $emailXorg); - $mailer->assign('als', join(', ', $als)); - $mailer->SetTxtBody(wordwrap($msg,72)); - $mailer->send(); + VALUES ({?}, {?})', + $hrmid, $subState->i('uid')); + // TODO: insert into source_other if new domain } $subState->set('forlife', $forlife); @@ -229,5 +244,5 @@ function finishRegistration($subState) } // }}} -// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8: ?>