Hide notices if the site is not in debug mode

[platal.git] / modules / platal.php

diff --git a/modules/platal.php b/modules/platal.php
index dff65ce..4d8c391 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
@@ -73,10 +73,10 @@ class PlatalModule extends PLModule
     {
         $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("Set-Cookie:");
+        header("Cache-Control:");
+        header("Expires:");
+        header("Content-Type: application/x-x509-ca-cert");
         header("Content-Length: ".strlen($data));
         echo $data;
         exit;
@@ -85,9 +85,12 @@ 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);
     }
@@ -256,7 +259,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();
 
@@ -292,7 +295,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');
         }
     }