X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fregister%2Fregister.inc.php;h=2edfef5bdff53ff589eaaf7595b433b299b24b79;hb=c441aabe4829c769c405eb46ef9b4ff815e454d6;hp=bd6f8601306245d0855a4d779617e982ad407651;hpb=4371e993d51f10d655c4b453563c730b613b490e;p=platal.git
diff --git a/modules/register/register.inc.php b/modules/register/register.inc.php
index bd6f860..2edfef5 100644
--- a/modules/register/register.inc.php
+++ b/modules/register/register.inc.php
@@ -1,6 +1,6 @@
set('xorgid', Profile::getXorgId($subState->i('schoolid')));
if (!$subState->v('xorgid')) {
@@ -50,46 +50,51 @@ function checkId($subState)
$subState->set('firstname', $profile->firstName());
$subState->set('uid', $profile->owner()->id());
$subState->set('watch', $profile->owner()->watch);
+ $subState->set('comment', $profile->owner()->comment);
$subState->set('birthdateRef', $profile->__get('birthdate_ref'));
return true;
}
// }}}
-// {{{ function checkOldId
+// {{{ function weakCheckId
-function checkOldId($subState)
+function weakCheckId($subState)
{
$uf = new UserFilter(new PFC_And(
new PFC_Not(new UFC_Dead()),
- new UFC_Promo('=', UserFilter::DISPLAY, $subState->s('promo')),
+ new UFC_Promo('=', $subState->s('edu_type'), $subState->s('yearpromo')),
new PFC_Not(new UFC_Registered(true))
));
- $it = $uf->iterProfiles();
- while ($profile = $it->next()) {
- if ($profile->compareNames($subState->s('firstname'), $subState->s('lastname'))) {
- $subState->set('lastname', $profile->lastName());
- $subState->set('firstname', $profile->firstName());
- $subState->set('uid', $profile->owner()->id());
- $subState->set('watch', $profile->owner()->watch);
- $subState->set('birthdateRef', $profile->__get('birthdate_ref'));
- $subState->set('xorgid', $profile->__get('xorg_id'));
- return true;
+ if ($it = $uf->iterProfiles()) {
+ while ($profile = $it->next()) {
+ if ($profile->compareNames($subState->s('firstname'), $subState->s('lastname'))) {
+ $subState->set('lastname', $profile->lastName());
+ $subState->set('firstname', $profile->firstName());
+ $subState->set('uid', $profile->owner()->id());
+ $subState->set('watch', $profile->owner()->watch);
+ $subState->set('comment', $profile->owner()->comment);
+ $subState->set('birthdateRef', $profile->__get('birthdate_ref'));
+ $subState->set('xorgid', $profile->__get('xorg_id'));
+ return true;
+ }
}
}
$uf = new UserFilter(new PFC_And(
new PFC_Not(new UFC_Dead()),
- new UFC_Promo('=', UserFilter::DISPLAY, $subState->s('promo')),
+ new UFC_Promo('=', $subState->s('edu_type'), $subState->s('yearpromo')),
new UFC_Registered(true)
));
- $it = $uf->iterProfiles();
- while ($profile = $it->next()) {
- if ($profile->compareNames($subState->s('firstname'), $subState->s('lastname'))) {
- $subState->set('uid', $profile->owner()->id());
- $subState->set('watch', $profile->owner()->watch);
- $subState->set('birthdateRef', $profile->__get('birthdate_ref'));
- $subState->set('xorgid', $profile->__get('xorg_id'));
- return 'Tu es vraisemblablement déjà inscrit !';
+ if ($it = $uf->iterProfiles()) {
+ while ($profile = $it->next()) {
+ if ($profile->compareNames($subState->s('firstname'), $subState->s('lastname'))) {
+ $subState->set('uid', $profile->owner()->id());
+ $subState->set('watch', $profile->owner()->watch);
+ $subState->set('comment', $profile->owner()->comment);
+ $subState->set('birthdateRef', $profile->__get('birthdate_ref'));
+ $subState->set('xorgid', $profile->__get('xorg_id'));
+ return 'Tu es vraisemblablement déjà inscrit !';
+ }
}
}
return 'Erreur : vérifie que tu as bien orthographié ton nom !';
@@ -110,10 +115,10 @@ function checkNewUser($subState)
$lastname = preg_replace("/''+/", '\'', $lastname);
$subState->set('lastname', mb_strtoupper($lastname));
- if ($subState->i('yearpromo') >= 1996) {
- $res = checkId($subState);
+ if ($subState->v('edu_type') == Profile::DEGREE_X && $subState->i('yearpromo') >= 1996) {
+ $res = strongCheckId($subState);
} else {
- $res = checkOldId($subState);
+ $res = weakCheckId($subState);
}
if ($res !== true) {
return $res;
@@ -129,10 +134,7 @@ function createAliases($subState)
{
global $globals;
- $emailXorg = PlUser::makeUserName($subState->t('firstname'), $subState->t('lastname'));
- $emailXorg2 = $emailXorg . sprintf(".%02u", ($subState->i('yearpromo') % 100));
-
- $res = XDB::query("SELECT hruid, state
+ $res = XDB::query("SELECT hruid, state, type
FROM accounts
WHERE uid = {?} AND hruid != ''",
$subState->i('uid'));
@@ -141,7 +143,7 @@ function createAliases($subState)
. "Envoie un mail à mail->domain}\">"
. "support@{$globals->mail->domain} en expliquant ta situation.";
} else {
- list($forlife, $state) = $res->fetchOneRow();
+ list($forlife, $state, $type) = $res->fetchOneRow();
}
if ($state == 'active') {
return "Tu es déjà inscrit, si tu ne te souviens plus de ton mot de passe d'accès au site, "
@@ -152,36 +154,53 @@ function createAliases($subState)
. "mail->domain}\">support@{$globals->mail->domain}.";
}
- $count = XDB::numRows('SELECT *
- FROM email_source_account AS s
- INNER JOIN email_virtual_domains AS d ON (s.domain = d.id)
- WHERE s.email = {?} AND d.name = {?}',
- $emailXorg, $globals->mail->domain);
- if ($count) {
- list($h_id, $h_type, $expire) = $res->fetchOneRow();
- if ($h_type != 'homonyme' and empty($expire)) {
- XDB::execute('UPDATE email_source_account AS e
- INNER JOIN email_virtual_domains AS d ON (e.domain = d.id)
- SET e.expire = ADDDATE(NOW(), INTERVAL 1 MONTH)
- WHERE e.email = {?} AND d.name = {?}',
- $emailXorg, $globals->mail->domain);
- $hrmid = 'h.' . $emailXorg . '.' . $globals->mail->domain;
+
+ $emailXorg = PlUser::makeUserName($subState->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);
+ // * second case: at least two homonyms registerd.
+ $result = XDB::query("SELECT hrmid
+ FROM email_source_other
+ WHERE type = 'homonym' AND email = {?}",
+ $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 *
- FROM email_source_account AS s
- INNER JOIN email_virtual_domains AS d ON (s.domain = d.id)
- WHERE s.uid = {?} AND d.name = {?} AND s.expire IS NULL',
- $h_id, $globals->mail->domain);
-
- $mailer = new PlMailer('register/lostalias.mail.tpl');
- $mailer->addTo($emailXorg . '@' . $globals->mail->domain);
- $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);
@@ -192,6 +211,7 @@ function createAliases($subState)
$subState->set('bestalias', $emailXorg);
$subState->set('emailXorg2', $emailXorg2);
}
+ $subState->set('main_mail_domain', User::$sub_mail_domains[$type] . Platal::globals()->mail->domain);
return true;
}
@@ -219,7 +239,7 @@ function finishRegistration($subState)
$mymail->assign('to', $subState->s('email'));
$mymail->assign('baseurl', $globals->baseurl);
$mymail->assign('hash', $hash);
- $mymail->assign('subject', $subState->s('bestalias') . '@' . $globals->mail->domain);
+ $mymail->assign('subject', ucfirst($globals->mail->domain) . ' : ' . $subState->s('bestalias'));
$mymail->send();
}