$nameTypes = DirEnum::getOptions(DirEnum::NAMETYPES);
$nameTypes = array_flip($nameTypes);
$res = XDB::query("SELECT a.uid, a.hruid, pnl.name AS lastname, pnf.name AS firstname, p.xorg_id AS xorgid,
+ pd.promo, pe.promo_year AS yearpromo, pde.degree AS edu_type,
p.birthdate_ref AS birthdateRef, FIND_IN_SET('watch', a.flags) AS watch, m.hash, a.type
FROM register_marketing AS m
INNER JOIN accounts AS a ON (m.uid = a.uid)
INNER JOIN account_profiles AS ap ON (a.uid = ap.uid AND FIND_IN_SET('owner', ap.perms))
INNER JOIN profiles AS p ON (p.pid = ap.pid)
+ INNER JOIN profile_display AS pd ON (p.pid = pd.pid)
+ INNER JOIN profile_education AS pe ON (pe.pid = p.pid AND FIND_IN_SET('primary', pe.flags))
+ INNER JOIN profile_education_degree_enum AS pde ON (pde.id = pe.degreeid)
INNER JOIN profile_name AS pnl ON (p.pid = pnl.pid AND pnl.typeid = {?})
INNER JOIN profile_name AS pnf ON (p.pid = pnf.pid AND pnf.typeid = {?})
WHERE m.hash = {?} AND a.state = 'pending'",
if ($res->numRows() == 1) {
$subState->merge($res->fetchOneRow());
$subState->set('main_mail_domain', User::$sub_mail_domains[$subState->v('type')]);
- $subState->set('yearpromo', substr($subState->s('hruid'), -4));
XDB::execute('INSERT INTO register_mstats (uid, sender, success)
SELECT m.uid, m.sender, 0
if (Post::has('yearpromo')) {
$edu_type = Post::t('edu_type');
$yearpromo = Post::i('yearpromo');
- $promo = $edu_type . $yearpromo;
- $year = ($edu_type == 'X') ? 'entry_year' : 'grad_year';
+ $promo = Profile::$cycle_prefixes[$edu_type] . $yearpromo;
$res = XDB::query("SELECT COUNT(*)
FROM accounts AS a
INNER JOIN account_profiles AS ap ON (a.uid = ap.uid AND FIND_IN_SET('owner', ap.perms))
INNER JOIN profiles AS p ON (p.pid = ap.pid)
INNER JOIN profile_education AS pe ON (pe.pid = p.pid AND FIND_IN_SET('primary', pe.flags))
- WHERE a.state = 'pending' AND p.deathdate IS NULL AND pe.$year = {?}",
+ WHERE a.state = 'pending' AND p.deathdate IS NULL AND pe.promo_year = {?}",
$yearpromo);
if (!$res->fetchOneCell()) {
$subState->set('promo', $promo);
$subState->set('yearpromo', $yearpromo);
$subState->set('edu_type', $edu_type);
- if ($edu_type == 'X') {
+ if ($edu_type == Profile::DEGREE_X) {
if ($yearpromo >= 1996 && $yearpromo < 2000) {
$subState->set('schoolid', ($yearpromo % 100) * 10 . '???');
+ $subState->set('schoolid_exemple', ($yearpromo % 100) * 10000 + 532);
+ $subState->set('schoolid_exemple_ev2', (($yearpromo + 1) % 100) * 10000 + 532);
} elseif($yearpromo >= 2000) {
$subState->set('schoolid', 100 + ($yearpromo % 100) . '???');
+ $subState->set('schoolid_exemple', (100 + ($yearpromo % 100)) * 1000 + 532);
+ $subState->set('schoolid_exemple_ev2', (100 + (($yearpromo + 1) % 100)) * 1000 + 532);
}
- } else {
- $subState->set('schoolid', '');
}
}
}
$this->load('register.inc.php');
$subState->set('firstname', Post::t('firstname'));
$subState->set('lastname', Post::t('lastname'));
- $subState->set('schoolid', Post::i('schoolid'));
+ if (Post::has('schoolid')) {
+ $subState->set('schoolid', Post::i('schoolid'));
+ }
$error = checkNewUser($subState);
if ($error !== true) {
if ($birth[2] < 100) {
$birth[2] += 1900;
}
- $year = $birth[2];
- $promo = $subState->i('yearpromo');
- if ($year > $promo - 15 || $year < $promo - 30) {
+ $year = $birth[2];
+ $ref_year = substr($subState->v('birthdateRef'), 0, 4);
+ if (abs($ref_year - $year) > 2) {
$error[] = "La 'Date de naissance' n'est pas correcte.";
$alert = "Date de naissance incorrecte à l'inscription - ";
$subState->set('wrong_birthdate', $birth);
// authentication token.
$res = XDB::query("SELECT r.uid, p.pid, r.forlife, r.bestalias, r.mailorg2,
r.password, r.email, r.services, r.naissance,
- pnl.name AS lastname, pnf.name AS firstname,
- pd.promo, p.sex, p.birthdate_ref, a.type AS eduType
+ pnl.name AS lastname, pnf.name AS firstname, pe.promo_year,
+ pd.promo, p.sex, p.birthdate_ref, a.type
FROM register_pending AS r
INNER JOIN accounts AS a ON (r.uid = a.uid)
INNER JOIN account_profiles AS ap ON (a.uid = ap.uid AND FIND_IN_SET('owner', ap.perms))
INNER JOIN profile_name AS pnl ON (p.pid = pnl.pid AND pnl.typeid = {?})
INNER JOIN profile_name AS pnf ON (p.pid = pnf.pid AND pnf.typeid = {?})
INNER JOIN profile_display AS pd ON (p.pid = pd.pid)
+ INNER JOIN profile_education AS pe ON (pe.pid = p.pid AND FIND_IN_SET('primary', pe.flags))
WHERE hash = {?} AND hash != 'INSCRIT' AND a.state = 'pending'",
$nameTypes['name_ini'], $nameTypes['firstname_ini'], $hash);
if (!$hash || $res->numRows() == 0) {
}
list($uid, $pid, $forlife, $bestalias, $emailXorg2, $password, $email, $services,
- $birthdate, $lastname, $firstname, $promo, $sex, $birthdate_ref, $eduType) = $res->fetchOneRow();
- $isX = ($eduType == 'x');
- $yearpromo = substr($forlife, -4);
- $promo = str_replace(' (en cours)', $yearpromo, $promo);
- $mail_domain = User::$sub_mail_domains[$eduType] . $globals->mail->domain;
+ $birthdate, $lastname, $firstname, $promo, $yearpromo, $sex, $birthdate_ref, $type) = $res->fetchOneRow();
+ $isX = ($type == 'x');
+ $mail_domain = User::$sub_mail_domains[$type] . $globals->mail->domain;
// Prepare the template for display.
$page->changeTpl('register/end.tpl');
$user = User::getSilentWithUID($uid);
$redirect = new Redirect($user);
$redirect->add_email($email);
+ fix_bestalias($user);
// Try to start a session (so the user don't have to log in); we will use
// the password available in Post:: to authenticate the user.
Platal::session()->start(AUTH_MDP);
// Subscribe the user to the services she did request at registration time.
+ require_once 'newsletter.inc.php';
foreach (explode(',', $services) as $service) {
- require_once 'newsletter.inc.php';
switch ($service) {
case 'ax_letter':
NewsLetter::forGroup(NewsLetter::GROUP_AX)->subscribe($user);
NewsLetter::forGroup(NewsLetter::GROUP_XORG)->subscribe($user);
break;
case 'imap':
- Email::activate_storage($user, 'imap');
+ Email::activate_storage($user, 'imap', Bogo::IMAP_DEFAULT);
break;
case 'ml_promo':
if ($isX) {
Platal::session()->updateNbNotifs();
// Forcibly register the new user on default forums.
- $promoForum = 'xorg.promo.' . strtolower($promo);
- $registeredForums = array('xorg.general', 'xorg.pa.divers', 'xorg.pa.logements', $promoForum);
- foreach ($registeredForums as $forum) {
- XDB::execute("INSERT INTO forum_subs (fid, uid)
- SELECT fid, {?}
- FROM forums
- WHERE name = {?}",
- $uid, $val);
+ $registeredForums = array('xorg.general', 'xorg.pa.divers', 'xorg.pa.logements');
- // Notify the newsgroup admin of the promotion forum needs be created.
- if (XDB::affectedRows() == 0 && $forum == $promoForum) {
+ if ($isX) {
+ $promoForum = 'xorg.promo.' . strtolower($promo);
+ $exists = XDB::fetchOneCell('SELECT COUNT(*)
+ FROM forums
+ WHERE name = {?}',
+ $promoForum);
+
+ if ($exists == 0) {
+ // Notify the newsgroup admin of the promotion forum needs be created.
$promoFull = new UserFilter(new UFC_Promo('=', UserFilter::DISPLAY, $promo));
$promoRegistered = new UserFilter(new PFC_And(
new UFC_Promo('=', UserFilter::DISPLAY, $promo),
$mymail->assign('promo', $promo);
$mymail->send();
}
+ } else {
+ $registeredForums[] = $promoForum;
}
}
+ foreach ($registeredForums as $forum) {
+ XDB::execute("INSERT INTO forum_subs (fid, uid)
+ SELECT fid, {?}
+ FROM forums
+ WHERE name = {?}",
+ $uid, $val);
+ }
+
// Update the global registration count stats.
$globals->updateNbIns();
projects / platal.git / commitdiff