pending commit, finished during MQ/S download ...

[platal.git] / hooks / tmp.inc.php

diff --git a/hooks/tmp.inc.php b/hooks/tmp.inc.php
index 7763a86..491e97b 100644 (file)
--- a/hooks/tmp.inc.php
+++ b/hooks/tmp.inc.php
@@ -23,17 +23,17 @@ function tmp_menu()
 {
     global $globals;
 
-    $globals->menu->addPrivateEntry(XOM_CUSTOM,   10, 'Mon profil',         'profil.php');
-    $globals->menu->addPrivateEntry(XOM_CUSTOM,   20, 'Mes contacts',       'carnet/mescontacts.php');
+    $globals->menu->addPrivateEntry(XOM_CUSTOM,   10, 'Mon profil',         'profile/edit');
+    $globals->menu->addPrivateEntry(XOM_CUSTOM,   20, 'Mes contacts',       'carnet/contacts');
     $globals->menu->addPrivateEntry(XOM_CUSTOM,   30, 'Mon carnet',         'carnet/');
-    $globals->menu->addPrivateEntry(XOM_CUSTOM,   40, 'Mon mot de passe',   'motdepasse.php');
-    $globals->menu->addPrivateEntry(XOM_CUSTOM,   50, 'Mes préférences',    'preferences.php');
+    $globals->menu->addPrivateEntry(XOM_CUSTOM,   40, 'Mon mot de passe',   'password');
+    $globals->menu->addPrivateEntry(XOM_CUSTOM,   50, 'Mes préférences',    'prefs');
 
-    $globals->menu->addPrivateEntry(XOM_GROUPS,   10, 'Trombi/Site promo',  'trombipromo.php');
-    $globals->menu->addPrivateEntry(XOM_GROUPS,   20, 'Conseil Pro.',       'referent.php');
+    $globals->menu->addPrivateEntry(XOM_GROUPS,   10, 'Trombi promo',       'trombi');
+    $globals->menu->addPrivateEntry(XOM_GROUPS,   20, 'Conseil Pro.',       'referent');
     if ($globals->geoloc->use_map())
         $globals->menu->addPrivateEntry(XOM_GROUPS,   10, 'Planisphère',    'geoloc/');
-    $globals->menu->addPrivateEntry(XOM_GROUPS,   30, 'Groupes X',          'http://www.polytechnique.net/plan.php');
+    $globals->menu->addPrivateEntry(XOM_GROUPS,   30, 'Groupes X',          'http://www.polytechnique.net/plan');
 
     $globals->menu->addPrivateEntry(XOM_INFOS,    10, 'Documentations',     'Docs/');
     $globals->menu->addPrivateEntry(XOM_INFOS,    20, 'Nous contacter',     'Docs/NousContacter');
@@ -45,7 +45,7 @@ function tmp_menu()
     $globals->menu->addPrivateEntry(XOM_ADMIN,    30, 'Trackers',           'http://trackers.polytechnique.org');
     $globals->menu->addPrivateEntry(XOM_ADMIN,    40, 'Support',            'http://support.polytechnique.org');
 
-    $globals->menu->addPublicEntry(XOM_US,    00, 'Me connecter !',         'login.php');
+    $globals->menu->addPublicEntry(XOM_US,    00, 'Me connecter !',         'events');
     $globals->menu->addPublicEntry(XOM_US,    10, 'M\'inscrire',            'register/');
     $globals->menu->addPublicEntry(XOM_US,    20, 'Pourquoi m\'inscrire ?', 'Docs/PourquoiM\'Inscrire');
 
@@ -72,19 +72,19 @@ function tmp_subscribe($forlife, $uid, $promo, $password)
 
 function tmp_prefs()
 {
-    $fmt  = Session::get('mail_fmt', 'html') == 'html' ? 'texte' : 'html';
-    $fmt2 = Session::get('mail_fmt', 'html') == 'html' ? 'texte' : 'HTML';
+    $fmt  = S::v('mail_fmt', 'html') == 'html' ? 'texte' : 'html';
+    $fmt2 = S::v('mail_fmt', 'html') == 'html' ? 'texte' : 'HTML';
     return Array(
             Array(
-                'url'    => 'preferences.php?mail_fmt='.$fmt,
+                'url'    => 'prefs?mail_fmt='.$fmt,
                 'title'  => 'Recevoir les mails en format '.$fmt2,
                 'text'   => 'Tu recois les mails envoyés par le site (lettre mensuelle, carnet, ...) de préférence <strong>sous forme de '
-                            .Session::get('mail_fmt', 'html').'</strong>',
+                            .S::v('mail_fmt', 'html').'</strong>',
                 'weight' => 80
             ),
             Array(
-                'url'    => 'preferences.php?rss='.(intval(Session::get('core_rss_hash')=='')),
-                'title'  => (Session::get('core_rss_hash') ? 'Désactiver' : 'Activer').' les fils rss',
+                'url'    => 'prefs?rss='.(intval(S::v('core_rss_hash')=='')),
+                'title'  => (S::v('core_rss_hash') ? 'Désactiver' : 'Activer').' les fils rss',
                 'text'   => 'Ceci te permet d\'utiliser les fils rss du site. Attention, désactiver puis réactiver les fils en change les URL !',
                 'weight' => 90
             )