X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fregister%2Fregister.inc.php;h=1ccb04176fadf37b904a78cb177b3c928a25a6bb;hb=34a82c29c450467e5fd0609ce7632a033a7fb3b7;hp=b445502523212200da29f339ff59b3594cbc8d28;hpb=f09bdd3d5aef5f01a916baa8c630f75ab8257de5;p=platal.git diff --git a/modules/register/register.inc.php b/modules/register/register.inc.php index b445502..1ccb041 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 !'; @@ -98,7 +103,7 @@ function checkOldId(&$subState) // }}} // {{{ function checkNewUser -function checkNewUser(&$subState) +function checkNewUser($subState) { $firstname = preg_replace("/[ \t]+/", ' ', $subState->t('firstname')); $firstname = preg_replace("/--+/", '-', $firstname); @@ -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; @@ -125,44 +130,57 @@ function checkNewUser(&$subState) // }}} // {{{ function createAliases -function createAliases(&$subState) +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 + $res = XDB::query("SELECT hruid, state, type FROM accounts - WHERE uid = {?} AND hruid != ''", $subState->i('uid')); + WHERE uid = {?} AND hruid != ''", + $subState->i('uid')); if ($res->numRows() == 0) { return "Tu n'as pas d'adresse à vie pré-attribuée.
" - . "Envoie un mail à mail->domain}\">" + . "Envoie un mail à mail->domain}\">" . "support@{$globals->mail->domain} en expliquant ta situation."; } else { - $forlife = $res->fetchOneCell(); + 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, " + . "tu peux suivre la procédure de récupération de mot de passe."; + } else if ($state == 'disabled') { + return "Ton compte a été désactivé par les administrateurs du site suite à des abus. " + . "Pour plus d'information ou pour demander la réactivation du compte, tu peux t'adresser à " + . "mail->domain}\">support@{$globals->mail->domain}."; } - $res = XDB::query('SELECT uid, type, expire - FROM aliases - WHERE alias = {?}', $emailXorg); + + $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; + $res = XDB::query('SELECT uid, expire + FROM email_source_account + WHERE email = {?} AND type != \'alias_aux\'', + $emailXorg); if ($res->numRows()) { - list($h_id, $h_type, $expire) = $res->fetchOneRow(); - if ($h_type != 'homonyme' and empty($expire)) { - XDB::execute('UPDATE aliases + list($h_id, $expire) = $res->fetchOneRow(); + if (empty($expire)) { + XDB::execute('UPDATE email_source_account SET expire = ADDDATE(NOW(), INTERVAL 1 MONTH) - WHERE alias = {?}', $emailXorg); - XDB::execute('REPLACE INTO homonyms (homonyme_id, uid) - VALUES ({?}, {?})', $subState->i('uid'), $h_id); - XDB::execute('REPLACE INTO homonyms (homonyme_id, uid) - VALUES ({?}, {?})', $h_id, $subState->i('uid')); - $res = XDB::query('SELECT alias - FROM aliases - WHERE uid = {?} AND expire IS NULL', $h_id); - $als = $res->fetchColumn(); - + 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($emailXorg . '@' . $globals->mail->domain); + $mailer->addTo($homonym); $mailer->setSubject("Perte de ton alias $emailXorg dans un mois !"); $mailer->assign('emailXorg', $emailXorg); $mailer->assign('als', join(', ', $als)); @@ -178,6 +196,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; } @@ -190,9 +209,12 @@ function finishRegistration($subState) global $globals; $hash = rand_url_id(12); - XDB::execute('REPLACE INTO register_pending (uid, forlife, bestalias, mailorg2, password, - email, date, relance, naissance, hash, services) - VALUES ({?}, {?}, {?}, {?}, {?}, {?}, NOW(), 0, {?}, {?}, {?})', + XDB::execute('INSERT INTO register_pending (uid, forlife, bestalias, mailorg2, password, + email, date, relance, naissance, hash, services) + VALUES ({?}, {?}, {?}, {?}, {?}, {?}, NOW(), 0, {?}, {?}, {?}) + ON DUPLICATE KEY UPDATE password=VALUES(password), email=VALUES(email), + date=VALUES(date), naissance=VALUES(naissance), + hash=VALUES(hash), services=VALUES(services)', $subState->i('uid'), $subState->s('forlife'), $subState->s('bestalias'), $subState->s('emailXorg2'), $subState->s('password'), $subState->s('email'), $subState->s('birthdate'), $hash, implode(',', $subState->v('services'))); @@ -202,7 +224,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(); }