<?php
/***************************************************************************
- * Copyright (C) 2003-2010 Polytechnique.org *
+ * Copyright (C) 2003-2011 Polytechnique.org *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
// {{{ function checkId
-function checkId(&$subState)
+function checkId($subState)
{
$subState->set('xorgid', Profile::getXorgId($subState->i('schoolid')));
if (!$subState->v('xorgid')) {
}
$uf = new UserFilter(new PFC_And(
- new UFC_UID($subState->i('xorg_id')),
- new PFC_Not(new UFC_Dead())
+ new UFC_SchoolId('xorg', $subState->i('xorgid')),
+ new PFC_Not(new UFC_Dead()),
+ new PFC_Not(new UFC_Registered(true))
));
- $user = $uf->getProfiles();
-
- if ($user->__get('state') == 'active') {
+ $profile = $uf->getProfile();
+ if (is_null($profile)) {
return "Tu es déjà inscrit ou ton matricule est incorrect !";
}
- if ($user->promo() != $subState->s('promo')) {
+
+ if ($profile->promo() != $subState->s('promo')) {
return 'Le matricule est incorrect.';
}
- if (!$user->compareNames($subState->s('firstname'), $subState->s('lastname'))) {
+ if (!$profile->compareNames($subState->s('firstname'), $subState->s('lastname'))) {
return "Erreur dans l'identification. Réessaie, il y a une erreur quelque part !";
}
- $subState->set('lastname', $user->lastName());
- $subState->set('firstname', $user->firstName());
- $subState->set('uid', $user->id());
- $subState->set('watch', $user->watch());
- $subState->set('birthdateRef', $user->profile->__get('birthdate_ref'));
+ $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'));
return true;
}
// }}}
// {{{ function checkOldId
-function checkOldId(&$subState)
+function checkOldId($subState)
{
$uf = new UserFilter(new PFC_And(
new PFC_Not(new UFC_Dead()),
$subState->set('lastname', $profile->lastName());
$subState->set('firstname', $profile->firstName());
$subState->set('uid', $profile->owner()->id());
- $subState->set('watch', $profile->owner()->watch());
+ $subState->set('watch', $profile->owner()->watch);
$subState->set('birthdateRef', $profile->__get('birthdate_ref'));
$subState->set('xorgid', $profile->__get('xorg_id'));
return true;
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('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 !';
// }}}
// {{{ function checkNewUser
-function checkNewUser(&$subState)
+function checkNewUser($subState)
{
$firstname = preg_replace("/[ \t]+/", ' ', $subState->t('firstname'));
$firstname = preg_replace("/--+/", '-', $firstname);
// }}}
// {{{ 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
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.<br />"
- . "Envoie un mail à <a href=\"mailto:support@{$globals->mail->domain}</a>\">"
+ . "Envoie un mail à <a href=\"mailto:support@{$globals->mail->domain}\">"
. "support@{$globals->mail->domain}</a> en expliquant ta situation.";
} else {
- $forlife = $res->fetchOneCell();
+ list($forlife, $state) = $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 <a href=\"recovery\">la procédure de récupération de mot de passe</a>.";
+ } 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 à "
+ . "<a href=\"mailto:support@{$globals->mail->domain}\">support@{$globals->mail->domain}</a>.";
}
- $res = XDB::query('SELECT uid, type, expire
- FROM aliases
- WHERE alias = {?}', $emailXorg);
- if ($res->numRows()) {
+ $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 aliases
- SET expire = ADDDATE(NOW(), INTERVAL 1 MONTH)
- WHERE alias = {?}', $emailXorg);
- XDB::execute('REPLACE INTO homonyms (homonyme_id, uid)
- VALUES ({?}, {?})', $h_id, $h_id);
- XDB::execute('REPLACE INTO homonyms (homonyme_id, uid)
- VALUES ({?}, {?})', $h_id, $uid);
- $res = XDB::query('SELECT alias
- FROM aliases
- WHERE uid = {?} AND expire IS NULL', $h_id);
- $als = $res->fetchColumn();
+ 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;
+ 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);
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')));
$mymail = new PlMailer('register/end.mail.tpl');
$mymail->assign('emailXorg', $subState->s('bestalias'));
- $mymail->assign('lemail', $subState->s('email'));
+ $mymail->assign('to', $subState->s('email'));
$mymail->assign('baseurl', $globals->baseurl);
$mymail->assign('hash', $hash);
- $mymail->assign('subj', $subState->s('bestalias') . '@' . $globals->mail->domain);
+ $mymail->assign('subject', $subState->s('bestalias') . '@' . $globals->mail->domain);
$mymail->send();
}
projects / platal.git / blobdiff