X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fregister.php;h=0d717a9a22e34869b6cc8ff55fad14e8196b05e3;hb=ce835419ab95b6b42dbb4bdc249b4bf7ffdc497b;hp=4dea3ae221e67e47e83342f60525059128d65d04;hpb=d7dd70be3dd8f76ae6dc9fed7977e7aa7b603085;p=platal.git
diff --git a/modules/register.php b/modules/register.php
index 4dea3ae..0d717a9 100644
--- a/modules/register.php
+++ b/modules/register.php
@@ -1,6 +1,6 @@
$this->make_hook('end', AUTH_PUBLIC),
'register/end.php' => $this->make_hook('end_old', AUTH_PUBLIC),
'register/success' => $this->make_hook('success', AUTH_MDP),
+ 'register/save' => $this->make_hook('save', AUTH_MDP),
);
}
@@ -48,7 +49,7 @@ class RegisterModule extends PLModule
$sub_state['backs'][] = $state;
if (count($sub_state['backs']) == 3) {
$alert .= "Tentative d'inscription tres hesitante - ";
- }
+ }
}
// Compatibility with old sources, keep it atm
@@ -69,7 +70,7 @@ class RegisterModule extends PLModule
$sub_state['nom'] = $nom;
$sub_state['prenom'] = $prenom;
$sub_state['ourmat'] = $ourmat;
- $sub_state['watch'] = $watch;
+ $sub_state['watch'] = $watch;
$sub_state['naissance_ini'] = $naiss;
XDB::execute(
@@ -143,10 +144,12 @@ class RegisterModule extends PLModule
"valide, en particulier, il ne peut pas être renvoyé vers lui-même.";
}
$birth = trim(Env::v('naissance'));
- if (!preg_match('/^[0-3][0-9][01][0-9][12][90][0-9][0-9]$/', $birth)) {
+ if (!preg_match('@^[0-3]?\d/[01]?\d/(19|20)?\d{2}$@', $birth)) {
$err[] = "La 'Date de naissance' n'est pas correcte.";
} else {
- $year = (int)substr($birth, 4, 4);
+ $birth = explode('/', $birth, 3);
+ $year = intval($birth[2]);
+ if ($year < 100) $year += 1900;
$promo = (int)$sub_state['promo'];
if ($year > $promo - 15 || $year < $promo - 30) {
$err[] = "La 'Date de naissance' n'est pas correcte.";
@@ -182,18 +185,16 @@ class RegisterModule extends PLModule
if (isset($err)) {
$err = join('
', $err);
} else {
- $sub_state['naissance'] = sprintf("%s-%s-%s",
- substr($birth,4,4),
- substr($birth,2,2),
- substr($birth,0,2));
+ $sub_state['naissance'] = sprintf("%04d-%02d-%02d",
+ intval($birth[2]), intval($birth[1]), intval($birth[0]));
if ($sub_state['naissance_ini'] != '0000-00-00' && $sub_state['naissance'] != $sub_state['naissance_ini']) {
$alert .= "Date de naissance incorrecte à l'inscription - ";
}
$sub_state['email'] = Post::v('email');
if (check_ip('unsafe')) {
$err = "Une erreur s'est produite lors de l'inscription."
- . " Merci de contacter mail->domain}>"
+ . " register@{$globals->mail->domain}"
. " pour nous faire part de cette erreur";
$alert .= "Tentative d'inscription depuis une IP surveillee";
} else {
@@ -308,6 +309,12 @@ class RegisterModule extends PLModule
$mymail->assign('prenom', $prenom);
$mymail->send();
+ require_once('user.func.inc.php');
+ user_reindex($uid);
+
+ // update number of subscribers (perms has changed)
+ update_NbIns();
+
if (!start_connexion($uid, false)) {
return PL_FORBIDDEN;
}
@@ -329,7 +336,7 @@ class RegisterModule extends PLModule
while (list($salias, $snom, $sprenom, $sfemme) = $res->next()) {
$mymail = new PlMailer();
$mymail->setSubject("$prenom $nom s'est inscrit à Polytechnique.org !");
- $mymail->setFrom('"Marketing Polytechnique.org" mails->domain . '>');
+ $mymail->setFrom('"Marketing Polytechnique.org" mail->domain . '>');
$mymail->addTo("\"$sprenom $snom\" <$salias@{$globals->mail->domain}>");
$msg = ($sfemme?'Chère':'Cher')." $sprenom,\n\n"
. "Nous t'écrivons pour t'informer que $prenom $nom (X$promo), "
@@ -346,7 +353,7 @@ class RegisterModule extends PLModule
if ($globals->register->notif) {
$mymail = new PlMailer();
$mymail->setSubject("Inscription de $prenom $nom (X$promo)");
- $mymail->setFrom('"Webmaster Polytechnique.org" mails->domain . '>');
+ $mymail->setFrom('"Webmaster Polytechnique.org" mail->domain . '>');
$mymail->addTo($globals->register->notif);
$msg = "$prenom $nom (X$promo) a terminé son inscription avec les données suivantes :\n"
. " - nom : $nom\n"
@@ -359,7 +366,7 @@ class RegisterModule extends PLModule
. " - ip : {$logger->ip} ({$logger->host})\n"
. ($logger->proxy_ip ? " - proxy : {$logger->proxy_ip} ({$logger->proxy_host})\n" : "");
$mymail->setTxtBody($msg);
- $mymail->send();
+ $mymail->send();
}
Marketing::clear($uid);
@@ -410,6 +417,51 @@ class RegisterModule extends PLModule
$page->addJsLink('motdepasse.js');
}
+
+ function handler_save(&$page)
+ {
+ global $globals;
+
+ // Finish registration procedure
+ if (Post::v('register_from_ax_question')) {
+ XDB::execute('UPDATE auth_user_quick
+ SET profile_from_ax = 1
+ WHERE user_id = {?}',
+ S::v('uid'));
+ }
+ if (Post::v('add_to_nl')) {
+ require_once 'newsletter.inc.php';
+ NewsLetter::subscribe();
+ }
+ if (Post::v('add_to_ax')) {
+ require_once dirname(__FILE__) . '/axletter/axletter.inc.php';
+ AXLetter::subscribe();
+ }
+ if (Post::v('add_to_promo')) {
+ $r = XDB::query('SELECT id FROM groupex.asso WHERE diminutif = {?}',
+ S::v('promo'));
+ $asso_id = $r->fetchOneCell();
+ XDB::execute('REPLACE INTO groupex.membres (uid,asso_id)
+ VALUES ({?}, {?})',
+ S::v('uid'), $asso_id);
+ $mmlist = new MMList(S::v('uid'), S::v('password'));
+ $mmlist->subscribe("promo".S::v('promo'));
+ }
+ if (Post::v('sub_ml')) {
+ $subs = array_keys(Post::v('sub_ml'));
+ $current_domain = null;
+ foreach ($subs as $list) {
+ list($sub, $domain) = explode('@', $list);
+ if ($domain != $current_domain) {
+ $current_domain = $domain;
+ $client = new MMList(S::v('uid'), S::v('password'), $domain);
+ }
+ $client->subscribe($sub);
+ }
+ }
+
+ pl_redirect('profile/edit');
+ }
}
// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: