Change default: show menu in xnet pages.

[platal.git] / modules / platal.php

diff --git a/modules/platal.php b/modules/platal.php
index 30cc13d..7d72369 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
@@ -55,6 +55,7 @@ class PlatalModule extends PLModule
             'password/smtp' => $this->make_hook('smtppass',  AUTH_MDP),
             'recovery'      => $this->make_hook('recovery',  AUTH_PUBLIC),
             'exit'          => $this->make_hook('exit', AUTH_PUBLIC),
+            'deconnexion.php' => $this->make_hook('exit', AUTH_PUBLIC),
 
             // happenings related thingies
             'rss'         => $this->make_hook('rss',       AUTH_PUBLIC),
@@ -70,9 +71,13 @@ class PlatalModule extends PLModule
 
     function handler_cacert(&$page)
     {
-        $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;
     }
@@ -190,7 +195,7 @@ class PlatalModule extends PLModule
         }
 
         $page->changeTpl('motdepasse.tpl');
-        $page->addJsLink('javascript/motdepasse.js');
+        $page->addJsLink('motdepasse.js');
         $page->assign('xorg_title','Polytechnique.org - Mon mot de passe');
     }
 
@@ -284,7 +289,7 @@ Mail envoy
             $mymail->send();
 
             // on cree un objet logger et on log l'evenement
-            $logger = $_SESSION['log'] = new DiogenesCoreLogger($uid);
+            $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.');
@@ -306,7 +311,7 @@ Mail envoy
         $uid = $ligne["uid"];
         if (Post::has('response2')) {
             $password = Post::v('response2');
-            $logger   = new DiogenesCoreLogger($uid);
+            $logger   = new CoreLogger($uid);
             XDB::query('UPDATE  auth_user_md5 SET password={?}
                                    WHERE  user_id={?} AND perms IN("admin","user")',
                                  $password, $uid);
@@ -315,7 +320,7 @@ Mail envoy
             $page->changeTpl('tmpPWD.success.tpl');
         } else {
             $page->changeTpl('motdepasse.tpl');
-            $page->addJsLink('javascript/motdepasse.js');
+            $page->addJsLink('motdepasse.js');
         }
     }