New PlMailer based on Hermes code:

[platal.git] / modules / platal.php

diff --git a/modules/platal.php b/modules/platal.php
index 4d8c391..d1cf8c6 100644 (file)
--- a/modules/platal.php
+++ b/modules/platal.php
@@ -85,12 +85,9 @@ class PlatalModule extends PLModule
     function handler_changelog(&$page)
     {
         $page->changeTpl('changeLog.tpl');
-        $page->addJsLink('wiki.js');
 
         $clog = htmlentities(file_get_contents(dirname(__FILE__).'/../ChangeLog'));
         $clog = preg_replace('!(#[0-9]+(,[0-9]+)*)!e', 'bugize("\1")', $clog);
-        $clog = preg_replace('!([-a-z0-9_.]+@[-a-z0-9_.]+)!ie',
-            '"<script type=\'text/javascript\'>Nix.decode(\"" . str_rot13("\1") . "\"); </script>"', $clog);
         $clog = preg_replace('!vim:.*$!', '', $clog);
         $page->assign('ChangeLog', $clog);
     }
@@ -194,6 +191,7 @@ class PlatalModule extends PLModule
             }
 
             $page->changeTpl('motdepasse.success.tpl');
+            $page->assign('now', strftime("%Y%m%d%H%M%S"));
             $page->run();
         }
 
@@ -271,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');
@@ -322,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');