Google Apps code polishing.

[platal.git] / modules / register.php

diff --git a/modules/register.php b/modules/register.php
index 69a8ae5..2820841 100644 (file)
--- a/modules/register.php
+++ b/modules/register.php
@@ -148,8 +148,10 @@ class RegisterModule extends PLModule
                         $err[] = "La 'Date de naissance' n'est pas correcte.";
                     } else {
                         $birth = explode('/', $birth, 3);
-                        $year  = intval($birth[2]);
-                        if ($year < 100) $year += 1900;
+                        for ($i = 0; $i < 3; $i++)
+                            $birth[$i] = intval($birth[$i]);
+                        if ($birth[2] < 100) $birth[2] += 1900;
+                        $year  = $birth[2];
                         $promo = (int)$sub_state['promo'];
                         if ($year > $promo - 15 || $year < $promo - 30) {
                             $err[] = "La 'Date de naissance' n'est pas correcte.";
@@ -326,7 +328,7 @@ class RegisterModule extends PLModule
         $res = XDB::iterRow(
                 "SELECT  sa.alias, IF(s.nom_usage,s.nom_usage,s.nom) AS nom,
                          s.prenom, FIND_IN_SET('femme', s.flags) AS femme,
-                         GROUP_CONCAT(m.email) AS mails
+                         GROUP_CONCAT(m.email) AS mails, MAX(m.last) AS dateDernier
                    FROM  register_marketing AS m
              INNER JOIN  auth_user_md5      AS s  ON ( m.sender = s.user_id )
              INNER JOIN  aliases            AS sa ON ( sa.id = m.sender
@@ -336,8 +338,8 @@ class RegisterModule extends PLModule
         XDB::execute("UPDATE register_mstats SET success=NOW() WHERE uid={?}", $uid);
 
         $market = array();
-        while (list($salias, $snom, $sprenom, $sfemme, $mails) = $res->next()) {
-            $market[] = " - par $snom $sprenom sur $mails";
+        while (list($salias, $snom, $sprenom, $sfemme, $mails, $dateDernier) = $res->next()) {
+            $market[] = " - par $snom $sprenom sur $mails (le plus récemment le $dateDernier)";
             $mymail = new PlMailer();
             $mymail->setSubject("$prenom $nom s'est inscrit à Polytechnique.org !");
             $mymail->setFrom('"Marketing Polytechnique.org" <register@' . $globals->mail->domain . '>');
@@ -384,6 +386,7 @@ class RegisterModule extends PLModule
 
     function handler_success(&$page)
     {
+        global $globals;
         $page->changeTpl('register/success.tpl');
 
         $_SESSION['sub_state'] = array('step' => 5);
@@ -394,6 +397,17 @@ class RegisterModule extends PLModule
                                      WHERE user_id={?}', $password,
                                    S::v('uid'));
 
+            // If GoogleApps is enabled, and the user did choose to use synchronized passwords,
+            // and if the (stupid) user has decided to user /register/success another time,
+            // updates the Google Apps password as well.
+            if ($globals->mailstorage->googleapps_domain) {
+                require_once 'googleapps.inc.php';
+                $account = new GoogleAppsAccount(S::v('uid'), S::v('forlife'));
+                if ($account->active() && $account->sync_password) {
+                    $account->set_password($password);
+                }
+            }
+
             $log = S::v('log');
             $log->log('passwd', '');
 
@@ -466,6 +480,11 @@ class RegisterModule extends PLModule
                 $client->subscribe($sub);
             }
         }
+        if (Post::v('imap')) {
+            require_once 'emails.inc.php';
+            $storage = new MailStorageIMAP(S::v('uid'));
+            $storage->enable();
+        }
 
         pl_redirect('profile/edit');
     }