New PlMailer based on Hermes code:

[platal.git] / modules / platal.php

diff --git a/modules/platal.php b/modules/platal.php
index 35514b8..d1cf8c6 100644 (file)
--- a/modules/platal.php
+++ b/modules/platal.php
@@ -39,7 +39,7 @@ class PlatalModule extends PLModule
     {
         return array(
             'index'       => $this->make_hook('index',     AUTH_PUBLIC),
-            'cacert.pem'  => $this->make_hook('cacert',    AUTH_PUBLIC),
+           'cacert.pem'  => $this->make_hook('cacert',    AUTH_PUBLIC),
             'changelog'   => $this->make_hook('changelog', AUTH_PUBLIC),
 
             // Preferences thingies
@@ -71,14 +71,13 @@ class PlatalModule extends PLModule
 
     function handler_cacert(&$page)
     {
-        if (preg_match('/MSIE/i', $_SERVER['HTTP_USER_AGENT']))
-        {
-            $data = file_get_contents('/etc/ssl/xorgCA/cacert.der');
-        } else {
-            $data = file_get_contents('/etc/ssl/xorgCA/cacert.pem');
-        }
-        header('Content-Type: application/x-x509-ca-cert');
-        header('Content-Length: '.strlen($data));
+        $data = file_get_contents("/etc/ssl/xorgCA/cacert.pem","r");
+        header("Pragma:");
+        header("Set-Cookie:");
+        header("Cache-Control:");
+        header("Expires:");
+        header("Content-Type: application/x-x509-ca-cert");
+        header("Content-Length: ".strlen($data));
         echo $data;
         exit;
     }
@@ -192,6 +191,7 @@ class PlatalModule extends PLModule
             }
 
             $page->changeTpl('motdepasse.success.tpl');
+            $page->assign('now', strftime("%Y%m%d%H%M%S"));
             $page->run();
         }
 
@@ -257,7 +257,7 @@ class PlatalModule extends PLModule
         $res = XDB::query(
                 "SELECT  user_id, naissance
                    FROM  auth_user_md5 AS u
-             INNER JOIN  aliases       AS a ON (u.user_id=a.id AND type!='homonyme')
+             INNER JOIN  aliases       AS a ON (u.user_id=a.id AND type != 'homonyme')
                   WHERE  a.alias={?} AND u.perms IN ('admin','user') AND u.deces=0", $mailorg);
         list($uid, $naissance) = $res->fetchOneRow();
 
@@ -269,8 +269,7 @@ class PlatalModule extends PLModule
             $res   = XDB::query('SELECT email FROM emails WHERE uid = {?} AND NOT FIND_IN_SET("filter", flags)', $uid);
             $mails = implode(', ', $res->fetchColumn());
 
-            require_once "diogenes/diogenes.hermes.inc.php";
-            $mymail = new HermesMailer();
+            $mymail = new PlMailer();
             $mymail->setFrom('"Gestion des mots de passe" <support+password@polytechnique.org>');
             $mymail->addTo($mails);
             $mymail->setSubject('Ton certificat d\'authentification');
@@ -293,7 +292,8 @@ Mail envoy
             $logger = $_SESSION['log'] = new CoreLogger($uid);
             $logger->log('recovery', $emails);
         } else {
-            $page->trig('Pas de résultat correspondant aux champs entrés dans notre base de données.');
+            $page->trig('Les informations que tu as rentrées ne permettent pas de récupérer ton mot de passe.<br />'.
+                        'Si tu as un homonyme, utilise prenom.nom.promo comme login');
         }
     }
 
@@ -319,6 +319,7 @@ Mail envoy
             XDB::query('DELETE FROM perte_pass WHERE certificat={?}', $certif);
             $logger->log("passwd","");
             $page->changeTpl('tmpPWD.success.tpl');
+            $page->assign('now', strftime("%Y%m%d%H%M%S"));
         } else {
             $page->changeTpl('motdepasse.tpl');
             $page->addJsLink('motdepasse.js');
@@ -402,10 +403,12 @@ Mail envoy
         $uid = init_rss('rss.tpl', $user, $hash);
 
         $rss = XDB::iterator(
-                'SELECT  e.id, e.titre, e.texte, e.creation_date
+                'SELECT  e.id, e.titre, e.texte, e.creation_date,
+                         IF(u2.nom_usage = "", u2.nom, u2.nom_usage) AS nom, u2.prenom, u2.promo
                    FROM  auth_user_md5   AS u
              INNER JOIN  evenements      AS e ON ( (e.promo_min = 0 || e.promo_min <= u.promo)
-                                                   AND (e.promo_max = 0 || e.promo_max >= u.promo) )
+                                                 AND (e.promo_max = 0 || e.promo_max >= u.promo) )
+             INNER JOIN  auth_user_md5   AS u2 ON (u2.user_id = e.user_id)
                   WHERE  u.user_id = {?} AND FIND_IN_SET(e.flags, "valide")
                                          AND peremption >= NOW()', $uid);
         $page->assign('rss', $rss);