Do not show or propose email services to masters and doctorants for now (Closes ...

Signed-off-by: Stéphane Jacob <sj@m4x.org>

diff --git a/modules/register.php b/modules/register.php
index 331f618..af6b4cc 100644 (file)
--- a/modules/register.php
+++ b/modules/register.php
@@ -52,7 +52,7 @@ class RegisterModule extends PLModule
             $nameTypes = DirEnum::getOptions(DirEnum::NAMETYPES);
             $nameTypes = array_flip($nameTypes);
             $res = XDB::query("SELECT  a.uid, pd.promo, pnl.name AS lastname, pnf.name AS firstname, p.xorg_id AS xorgid,
-                                       p.birthdate_ref AS birthdateRef, FIND_IN_SET('watch', a.flags) AS watch, m.hash
+                                       p.birthdate_ref AS birthdateRef, FIND_IN_SET('watch', a.flags) AS watch, m.hash, a.type as eduType
                                  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))
@@ -171,8 +171,13 @@ class RegisterModule extends PLModule
                     }
 
                     // Register the optional services requested by the user.
+                    if ($subState->v('eduType') == 'x') {
+                        $proposedServices = array('ax_letter', 'imap', 'ml_promo', 'nl');
+                    } else {
+                        $proposedServices = array('ax_letter', 'nl');
+                    }
                     $services = array();
-                    foreach (array('ax_letter', 'imap', 'ml_promo', 'nl') as $service) {
+                    foreach ($proposedServices as $service) {
                         if (Post::b($service)) {
                             $services[] = $service;
                         }
@@ -277,7 +282,7 @@ class RegisterModule extends PLModule
         $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
+                                   pd.promo, p.sex, p.birthdate_ref, a.type AS eduType
                              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))
@@ -303,7 +308,8 @@ class RegisterModule extends PLModule
         }
 
         list($uid, $pid, $forlife, $bestalias, $emailXorg2, $password, $email, $services,
-             $birthdate, $lastname, $firstname, $promo, $sex, $birthdate_ref) = $res->fetchOneRow();
+             $birthdate, $lastname, $firstname, $promo, $sex, $birthdate_ref, $eduType) = $res->fetchOneRow();
+        $isX = ($eduType == 'x');
         $yearpromo = substr($promo, 1, 4);
 
         // Prepare the template for display.
@@ -349,8 +355,14 @@ class RegisterModule extends PLModule
         // Add the registration email address as first and only redirection.
         require_once 'emails.inc.php';
         $user = User::getSilentWithUID($uid);
-        $redirect = new Redirect($user);
-        $redirect->add_email($email);
+        if ($isX) {
+            $redirect = new Redirect($user);
+            $redirect->add_email($email);
+        } else {
+            XDB::execute('UPDATE  accounts
+                             SET  email = {?}
+                           WHERE  uid = {?}', $email, $uid);
+        }
 
         // 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.
@@ -393,6 +405,13 @@ class RegisterModule extends PLModule
 
         // Congratulate our newly registered user by email.
         $mymail = new PlMailer('register/success.mail.tpl');
+        if ($isX) {
+            $mymail->addTo("\"{$user->fullName()}\" <{$user->forlifeEmail()}>");
+            $mymail->setSubject('Bienvenue parmi les X sur le web !');
+        } else {
+            $mymail->addTo($email);
+            $mymail->setSubject('Bienvenue sur Polytechnique.org !');
+        }
         $mymail->assign('forlife', $forlife);
         $mymail->assign('firstname', $firstname);
         $mymail->send();

diff --git a/templates/register/step3.tpl b/templates/register/step3.tpl
index 960b8ef..11ae26c 100644 (file)
--- a/templates/register/step3.tpl
+++ b/templates/register/step3.tpl
@@ -115,6 +115,7 @@
           <dd>
             de recevoir les informations importantes de l'AX.
           </dd>
+          {if $smarty.session.subState.eduType eq 'x'}
           <dt><label><input type="checkbox" checked="checked" name="ml_promo" /> ta promotion</label></dt>
           <dd>
             de recevoir les informations plus spécifiques de ta promotion pour pouvoir participer plus facilement aux événements
@@ -124,6 +125,7 @@
           <dd>
             d'avoir un accès de secours aux 30 derniers jours d'emails reçus sur ton adresse Polytechnique.org.
           </dd>
+          {/if}
         </dl>
       </td>
     </tr>

diff --git a/templates/register/success.mail.tpl b/templates/register/success.mail.tpl
index 3a78569..6b0df7c 100644 (file)
--- a/templates/register/success.mail.tpl
+++ b/templates/register/success.mail.tpl
@@ -23,8 +23,6 @@
 {config_load file="mails.conf" section="inscription"}
 {if $mail_part eq 'head'}
 {from full=#from#}
-{to addr="$forlife@polytechnique.org"}
-{subject text="Bienvenue parmi les X sur le web !"}
 {elseif $mail_part eq 'text'}
 
 {$firstname}, félicitations pour ton inscription !