drop url modifier \o/

git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@532 839d8a87-29fc-0310-9880-83ba4fa771e5

diff --git a/include/xorg/menu.inc.php b/include/xorg/menu.inc.php
index 41c9e45..0d5b4b8 100644 (file)
--- a/include/xorg/menu.inc.php
+++ b/include/xorg/menu.inc.php
@@ -73,6 +73,10 @@ class XOrgMenu
 
     function addPublicEntry($head, $prio, $text, $url)
     {
+        if (strpos($url, '://') === false) {
+            global $globals;
+            $url = $globals->baseurl.'/'.$url;
+        }
         $this->_ext[$head][] = Array($prio, 'text' => $text, 'url' => $url);
     }
 
@@ -81,6 +85,10 @@ class XOrgMenu
 
     function addPrivateEntry($head, $prio, $text, $url)
     {
+        if (strpos($url, '://') === false) {
+            global $globals;
+            $url = $globals->baseurl.'/'.$url;
+        }
         $this->_int[$head][] = Array($prio, 'text' => $text, 'url' => $url);
     }
 
@@ -91,9 +99,11 @@ class XOrgMenu
     {
         $res = S::logged() ? $this->_int : $this->_ext;
         if (S::identified()) {
-            $res[XOM_NO][] = Array(0, 'text' => 'Déconnexion', 'url' => 'exit');
+            $res[XOM_NO][] = Array(0, 'text' => 'Déconnexion',
+                                   'url' => $globals->baseurl.'/exit');
         } elseif (Cookie::has('ORGaccess')) {
-            $res[XOM_NO][] = Array(0, 'text' => 'Déconnexion totale', 'url' => 'exit/forget');
+            $res[XOM_NO][] = Array(0, 'text' => 'Déconnexion totale',
+                                   'url' => $globals->baseurl.'/exit/forget');
         }
         if (!S::has_perms()) {
             unset($res[XOM_ADMIN]);

diff --git a/plugins/modifier.url.php b/plugins/modifier.url.php
deleted file mode 100644 (file)
index 2dcb4b8..0000000
--- a/plugins/modifier.url.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-/***************************************************************************
- *  Copyright (C) 2003-2006 Polytechnique.org                              *
- *  http://opensource.polytechnique.org/                                   *
- *                                                                         *
- *  This program is free software; you can redistribute it and/or modify   *
- *  it under the terms of the GNU General Public License as published by   *
- *  the Free Software Foundation; either version 2 of the License, or      *
- *  (at your option) any later version.                                    *
- *                                                                         *
- *  This program is distributed in the hope that it will be useful,        *
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of         *
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the          *
- *  GNU General Public License for more details.                           *
- *                                                                         *
- *  You should have received a copy of the GNU General Public License      *
- *  along with this program; if not, write to the Free Software            *
- *  Foundation, Inc.,                                                      *
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
- ***************************************************************************/
-
-function smarty_modifier_url($string)
-{
-    global $globals;
-    if(strpos($string, "http://")!==false)
-       return $string;
-    return $globals->baseurl."/".$string;
-}
-?>

diff --git a/templates/admin/lists.tpl b/templates/admin/lists.tpl
index 7e56fb1..3c9e07d 100644 (file)
--- a/templates/admin/lists.tpl
+++ b/templates/admin/lists.tpl
@@ -31,7 +31,7 @@
   </tr>
   {foreach from=$listes item=l}
   <tr class='{cycle values="impair,pair"}'>
-    <td><a href='{"listes/soptions.php"|url}?liste={$l}'>{$l}</a></td>
+    <td><a href='{rel}/{$platal->ns}lists/soptions/{$l}'>{$l}</a></td>
   </tr>
   {/foreach}
 </table>

diff --git a/templates/carnet/mescontacts.tpl b/templates/carnet/mescontacts.tpl
index debf8d0..3dfdb59 100644 (file)
--- a/templates/carnet/mescontacts.tpl
+++ b/templates/carnet/mescontacts.tpl
@@ -36,7 +36,7 @@
 </form>
 <p>
   Tu peux également rajouter des camarades dans tes contacts lors d'une recherche dans l'annuaire : 
-  il te suffit de cliquer sur l'icône <img src="{"images/ajouter.gif"|url}" alt="ajout contact" /> en face de son nom dans les résultats !
+  il te suffit de cliquer sur l'icône <img src="{rel}/images/ajouter.gif" alt="ajout contact" /> en face de son nom dans les résultats !
 </p>  
 
 {if $trombi || $citer->total()}

diff --git a/templates/carnet/notifs.tpl b/templates/carnet/notifs.tpl
index 46c962d..85c3165 100644 (file)
--- a/templates/carnet/notifs.tpl
+++ b/templates/carnet/notifs.tpl
@@ -102,7 +102,7 @@ Si un non-inscrit que tu surveilles s'inscrit, il sera automatiquement ajout
 
 <p>
 Pour surveiller des membres non-inscrits, il faut passer par la <a href="{rel}/search" class='popup'>recherche</a>
-et cliquer sur les icones <img src="{"images/ajouter.gif"|url}" alt="Ajouter" /> pour les ajouter à cette liste
+et cliquer sur les icones <img src="{rel}/images/ajouter.gif" alt="Ajouter" /> pour les ajouter à cette liste
 </p>
 
 <table class='tinybicol' cellpadding="0" cellspacing="0">
@@ -115,7 +115,7 @@ et cliquer sur les icones <img src="{"images/ajouter.gif"|url}" alt="Ajouter" />
       <ul>
         {foreach from=$watch->nonins() item=p}
         <li>
-        {$p.prenom} {$p.nom} ({$p.promo}) <a href="{rel}/carnet/notifs/del_nonins/{$p.user_id}"><img src="{"images/retirer.gif"|url}" alt="retirer" /></a>
+        {$p.prenom} {$p.nom} ({$p.promo}) <a href="{rel}/carnet/notifs/del_nonins/{$p.user_id}"><img src="{rel}/images/retirer.gif" alt="retirer" /></a>
         </li>
         {/foreach}
       </ul>

diff --git a/templates/carnet/panel.tpl b/templates/carnet/panel.tpl
index 60028d3..627e7fa 100644 (file)
--- a/templates/carnet/panel.tpl
+++ b/templates/carnet/panel.tpl
@@ -70,7 +70,7 @@ Il faut pour cel
       </a>
       {if !$promo[row].contact}
       <a href="{rel}/carnet/contacts?action=ajouter&amp;user={$promo[row].bestalias}">{*
-        *}<img src="{"images/ajouter.gif"|url}" alt="ajouter à mes contacts" />{*
+        *}<img src="{rel}/images/ajouter.gif" alt="ajouter à mes contacts" />{*
       *}</a>
       {/if}
       {else}

diff --git a/templates/include/flags.radio.tpl b/templates/include/flags.radio.tpl
index 8e3f2df..b05081f 100644 (file)
--- a/templates/include/flags.radio.tpl
+++ b/templates/include/flags.radio.tpl
@@ -43,7 +43,7 @@
               prive
             </td>
             <td class="texte">
-              <a href="{"docs/faq.php"|url}#flags" class="popup_800x240">Quelle couleur ??</a>
+              <a href="{rel}/Docs/FAQ#flags" class="popup_800x240">Quelle couleur ??</a>
             </td>
           </tr>
         </table>

diff --git a/templates/listes/options.tpl b/templates/listes/options.tpl
index 84442ab..138f296 100644 (file)
--- a/templates/listes/options.tpl
+++ b/templates/listes/options.tpl
@@ -167,7 +167,7 @@ redirection en mode 'inactif'. le logiciel de mailing list saura se d
         {if $options.accept_these_nonmembers|@count}
         {foreach from=$options.accept_these_nonmembers item=addr}
         {$addr}<a href='{rel}/{$platal->ns}lists/options/{$platal->argv[1]}&amp;atn_del={$addr}'>
-          <img src='{"images/retirer.gif"|url}' alt='retirer de la whitelist' title="retirer {$addr} de la whitelist" />
+          <img src="{rel}/images/retirer.gif" alt='retirer de la whitelist' title="retirer {$addr} de la whitelist" />
         </a><br />
         {/foreach}
         {else}

diff --git a/templates/marketing/promo.tpl b/templates/marketing/promo.tpl
index d0d35fc..3f62847 100644 (file)
--- a/templates/marketing/promo.tpl
+++ b/templates/marketing/promo.tpl
@@ -37,7 +37,7 @@
 <br />
 
 <div class="center">
-  <a href="javascript:void(window.open('{"stats/stats_promo.php"|url}?promo={$promo}','','width=800,height=600,toolbar=no'))">
+  <a href="javascript:void(window.open('{rel}/stats/stats_promo.php?promo={$promo}','','width=800,height=600,toolbar=no'))">
     Voir l'évolution des inscriptions de la promotion
   </a>
 </div>

diff --git a/templates/profil/adresses.tpl b/templates/profil/adresses.tpl
index febaf6d..02a5110 100644 (file)
--- a/templates/profil/adresses.tpl
+++ b/templates/profil/adresses.tpl
@@ -66,7 +66,7 @@
     {else}
     {assign var="titre" value="Nouvelle adresse :"}
     {/if}
-    {include file="geoloc/form.address.tpl" adr=$adr titre=$titre url="profile/edit/`$onglet`"|url}
+    {include file="geoloc/form.address.tpl" adr=$adr titre=$titre}
     <tr>
       <td class="colg">
         <span class="titre">Adresse:</span>

diff --git a/templates/profil/emploi.tpl b/templates/profil/emploi.tpl
index f288814..7d5f74a 100644 (file)
--- a/templates/profil/emploi.tpl
+++ b/templates/profil/emploi.tpl
@@ -217,7 +217,7 @@
       <td class="dcolg">
         <span class="titre">Curriculum vitae</span><br />
         <span class="comm">Le CV n'est <strong>jamais</strong> public.<br />
-          <a href="{"docs/faq.php"|url}#cv" class="popup_800x480">Comment remplir mon CV ?</a></span>
+          <a href="{rel}/Docs/FAQ#cv" class="popup_800x480">Comment remplir mon CV ?</a></span>
       </td>
       <td class="dcold">
         <textarea name="cv" rows="15" cols="33">{$cv}</textarea>

diff --git a/templates/profil/general.tpl b/templates/profil/general.tpl
index 3cd6652..2e19d12 100644 (file)
--- a/templates/profil/general.tpl
+++ b/templates/profil/general.tpl
@@ -282,7 +282,7 @@
               privé
             </td>
             <td class="texte">
-              <a href="{"docs/faq.php"|url}#flags" class="popup_800x240">Quelle couleur ??</a>
+              <a href="{rel}/Docs/FAQ#flags" class="popup_800x240">Quelle couleur ??</a>
             </td>
           </tr>
         </table>
@@ -308,7 +308,7 @@
               site public
             </td>
             <td class="texte">
-              <a href="{"docs/faq.php"|url}#flags" class="popup_800x240">Quelle couleur ??</a>
+              <a href="{rel}/Docs/FAQ#flags" class="popup_800x240">Quelle couleur ??</a>
             </td>
           </tr>
         </table>
@@ -334,7 +334,7 @@
               site public
             </td>
             <td class="texte">
-              <a href="{"docs/faq.php"|url}#flags" class="popup_800x240">Quelle couleur ??</a>
+              <a href="{rel}/Docs/FAQ#flags" class="popup_800x240">Quelle couleur ??</a>
             </td>
           </tr>
         </table>

diff --git a/templates/profil/skill.tpl b/templates/profil/skill.tpl
index 272fdea..216ea0d 100644 (file)
--- a/templates/profil/skill.tpl
+++ b/templates/profil/skill.tpl
@@ -169,7 +169,7 @@
         <span class="titre">Niveau</span>
       </td>
       <td class="cold" style="width:15%">
-        <span class="lien"><a href="{"docs/faq.php"|url}#niveau_langue" class="popup_800x600">Quel niveau ?</a></span>
+        <span class="lien"><a href="{rel}/docs/faq.php#niveau_langue" class="popup_800x600">Quel niveau ?</a></span>
       </td>
     </tr>
     {foreach from=$langue_name item=name key=i}

diff --git a/templates/skin/default.tpl b/templates/skin/default.tpl
index 34ee9fd..45c2234 100644 (file)
--- a/templates/skin/default.tpl
+++ b/templates/skin/default.tpl
@@ -68,7 +68,7 @@
           <div class="menu_title">{$menu_title}</div>
           {/if}
           {foreach item=mi from=$menu_list}
-          <div class='menu_item'><a href="{$mi.url|url}">{$mi.text}</a></div>
+          <div class='menu_item'><a href="{$mi.url}">{$mi.text}</a></div>
           {/foreach}
           {/foreach}
           {perms level=admin}

diff --git a/templates/skin/espace.tpl b/templates/skin/espace.tpl
index 0828526..595959c 100644 (file)
--- a/templates/skin/espace.tpl
+++ b/templates/skin/espace.tpl
@@ -55,12 +55,12 @@
     <table id="body" cellpadding="0" cellspacing="0">
       <tr>
         <td id="body-logo">
-          <a href="{rel}/events"><img src="{"images/sk_espace_logo.gif"|url}" alt="[ LOGO ]" /></a>
+          <a href="{rel}/events"><img src="{rel}/images/sk_espace_logo.gif" alt="[ LOGO ]" /></a>
         </td>
         <td id="body-top">
-          <a href="{rel}/events"><img src="{"images/sk_espace_ban.jpg"|url}" alt="[ Polytechnique.org ]" /></a>
+          <a href="{rel}/events"><img src="{rel}/images/sk_espace_ban.jpg" alt="[ Polytechnique.org ]" /></a>
           {include file="skin/common.title.header.tpl"}
-          <a href="{rel}/events"><img src="{"images/sk_espace_lesX.gif"|url}" alt="[LES X SUR LE WEB]" /></a>
+          <a href="{rel}/events"><img src="{rel}/images/sk_espace_lesX.gif" alt="[LES X SUR LE WEB]" /></a>
         </td>
       </tr>
       <tr>
@@ -70,14 +70,14 @@
           <div class="menu_title">{$menu_title}</div>
           {/if}
           {foreach item=mi from=$menu_list}
-          <div class='menu_item'><a href="{$mi.url|url}">{$mi.text}</a></div>
+          <div class='menu_item'><a href="{$mi.url}">{$mi.text}</a></div>
           {/foreach}
           {/foreach}
           {perms level=admin}
           <table class="bicol" style="font-weight:normal;text-align:center; border-left:0px; border-right:0px; margin-top:0.5em; width:100%; margin-left: 0; font-size: smaller;">
             <tr><th>Valid</th></tr>
             <tr class="impair">
-              <td><a href="{"admin/valider.php"|url}">{insert name="mkStats"}</a></td>
+              <td><a href="{rel}/admin/valider.php">{insert name="mkStats"}</a></td>
             </tr>
           </table>
           {/perms}

diff --git a/templates/skin/humlinux.tpl b/templates/skin/humlinux.tpl
index 9d0fc81..5dcc065 100644 (file)
--- a/templates/skin/humlinux.tpl
+++ b/templates/skin/humlinux.tpl
@@ -55,10 +55,10 @@
     <table id="body" cellpadding="0" cellspacing="0">
       <tr>
         <td id="body-logo">
-          <a href="{rel}/events"><img src="{"images/sk_humlinux_logo.gif"|url}" alt="[ LOGO ]" /></a>
+          <a href="{rel}/events"><img src="{rel}/images/sk_humlinux_logo.gif" alt="[ LOGO ]" /></a>
         </td>
         <td id="body-top">
-          <a href="{rel}/events"><img src="{"images/sk_humlinux_lesX.gif"|url}" alt="[LES X SUR LE WEB]" /></a>
+          <a href="{rel}/events"><img src="{rel}/images/sk_humlinux_lesX.gif" alt="[LES X SUR LE WEB]" /></a>
           {include file="skin/common.title.header.tpl"}
         </td>
       </tr>
@@ -69,14 +69,14 @@
           <div class="menu_title">{$menu_title}</div>
           {/if}
           {foreach item=mi from=$menu_list}
-          <div class='menu_item'><a href="{$mi.url|url}">{$mi.text}</a></div>
+          <div class='menu_item'><a href="{$mi.url}">{$mi.text}</a></div>
           {/foreach}
           {/foreach}
           {perms level=admin}
           <table class="bicol" style="font-weight:normal;text-align:center; border-left:0px; border-right:0px; margin-top:0.5em; width:100%; margin-left: 0; font-size: smaller;">
             <tr><th>Valid</th></tr>
             <tr class="impair">
-              <td><a href="{"admin/valider.php"|url}">{insert name="mkStats"}</a></td>
+              <td><a href="{rel}/admin/valider.php">{insert name="mkStats"}</a></td>
             </tr>
           </table>
           {/perms}

diff --git a/templates/skin/linux.tpl b/templates/skin/linux.tpl
index c371c7d..2154382 100644 (file)
--- a/templates/skin/linux.tpl
+++ b/templates/skin/linux.tpl
@@ -55,12 +55,12 @@
     <table id="body" cellpadding="0" cellspacing="0">
       <tr>
         <td id="body-logo">
-          <a href="{rel}/events"><img src="{"images/sk_linux_logo.jpg"|url}" alt="[ LOGO ]" /></a>
+          <a href="{rel}/events"><img src="{rel}/images/sk_linux_logo.jpg" alt="[ LOGO ]" /></a>
         </td>
         <td id="body-top">
-          <a href="{rel}/events"><img src="{"images/sk_linux_ban.jpg"|url}" alt="[ Polytechnique.org ]" /></a>
+          <a href="{rel}/events"><img src="{rel}/images/sk_linux_ban.jpg" alt="[ Polytechnique.org ]" /></a>
           {include file="skin/common.title.header.tpl"}
-          <a href="{rel}/events"><img src="{"images/sk_linux_lesX.jpg"|url}" alt="[LES X SUR LE WEB]" /></a>
+          <a href="{rel}/events"><img src="{rel}/images/sk_linux_lesX.jpg" alt="[LES X SUR LE WEB]" /></a>
         </td>
       </tr>
       <tr>
@@ -70,14 +70,14 @@
           <div class="menu_title">{$menu_title}</div>
           {/if}
           {foreach item=mi from=$menu_list}
-          <div class='menu_item'><a href="{$mi.url|url}">{$mi.text}</a></div>
+          <div class='menu_item'><a href="{$mi.url}">{$mi.text}</a></div>
           {/foreach}
           {/foreach}
           {perms level=admin}
           <table class="bicol" style="font-weight:normal;text-align:center; border-left:0px; border-right:0px; margin-top:0.5em; width:100%; margin-left: 0; font-size: smaller;">
             <tr><th>Valid</th></tr>
             <tr class="impair">
-              <td><a href="{"admin/valider.php"|url}">{insert name="mkStats"}</a></td>
+              <td><a href="{rel}/admin/valider.php">{insert name="mkStats"}</a></td>
             </tr>
           </table>
           {/perms}

diff --git a/templates/skin/liteskin.tpl b/templates/skin/liteskin.tpl
index 31cc624..882a162 100644 (file)
--- a/templates/skin/liteskin.tpl
+++ b/templates/skin/liteskin.tpl
@@ -55,10 +55,10 @@
     <table id="body" cellpadding="0" cellspacing="0">
       <tr>
         <td id="body-logo">
-          <a href="{rel}/events"><img src="{"images/sk_liteskin_logo.png"|url}" alt="[ LOGO ]" /></a>
+          <a href="{rel}/events"><img src="{rel}/images/sk_liteskin_logo.png" alt="[ LOGO ]" /></a>
         </td>
         <td id="body-top">
-          <a href="{rel}/events"><img src="{"images/sk_liteskin_titre.png"|url}" alt="[ Polytechnique.org ]" /></a>
+          <a href="{rel}/events"><img src="{rel}/images/sk_liteskin_titre.png" alt="[ Polytechnique.org ]" /></a>
           {include file="skin/common.title.header.tpl"}
         </td>
       </tr>
@@ -69,14 +69,14 @@
           <div class="menu_title">{$menu_title}</div>
           {/if}
           {foreach item=mi from=$menu_list}
-          <div class='menu_item'><a href="{$mi.url|url}">{$mi.text}</a></div>
+          <div class='menu_item'><a href="{$mi.url}">{$mi.text}</a></div>
           {/foreach}
           {/foreach}
           {perms level=admin}
           <table class="bicol" style="font-weight:normal;text-align:center; border-left:0px; border-right:0px; margin-top:0.5em; width:100%; margin-left: 0; font-size: smaller;">
             <tr><th>Valid</th></tr>
             <tr class="impair">
-              <td><a href="{"admin/valider.php"|url}">{insert name="mkStats"}</a></td>
+              <td><a href="{rel}/admin/valider.php">{insert name="mkStats"}</a></td>
             </tr>
           </table>
           {/perms}

diff --git a/templates/skin/nbviolet.tpl b/templates/skin/nbviolet.tpl
index 56ea229..41995b1 100644 (file)
--- a/templates/skin/nbviolet.tpl
+++ b/templates/skin/nbviolet.tpl
@@ -55,12 +55,12 @@
     <table id="body" cellpadding="0" cellspacing="0">
       <tr>
         <td id="body-logo">
-          <a href="{rel}/events"><img src="{"images/sk_nbviolet_logo.gif"|url}" alt="[ LOGO ]" /></a>
+          <a href="{rel}/events"><img src="{rel}/images/sk_nbviolet_logo.gif" alt="[ LOGO ]" /></a>
         </td>
         <td id="body-top">
-          <a href="{rel}/events"><img src="{"images/sk_nbviolet_ban.jpg"|url}" alt="[ Polytechnique.org ]" /></a>
+          <a href="{rel}/events"><img src="{rel}/images/sk_nbviolet_ban.jpg" alt="[ Polytechnique.org ]" /></a>
           {include file="skin/common.title.header.tpl"}
-          <a href="{rel}/events"><img src="{"images/sk_nbviolet_lesX.gif"|url}" alt="[LES X SUR LE WEB]" /></a>
+          <a href="{rel}/events"><img src="{rel}/images/sk_nbviolet_lesX.gif" alt="[LES X SUR LE WEB]" /></a>
         </td>
       </tr>
       <tr>
@@ -70,14 +70,14 @@
           <div class="menu_title">{$menu_title}</div>
           {/if}
           {foreach item=mi from=$menu_list}
-          <div class='menu_item'><a href="{$mi.url|url}">{$mi.text}</a></div>
+          <div class='menu_item'><a href="{$mi.url}">{$mi.text}</a></div>
           {/foreach}
           {/foreach}
           {perms level=admin}
           <table class="bicol" style="font-weight:normal;text-align:center; border-left:0px; border-right:0px; margin-top:0.5em; width:100%; margin-left: 0; font-size: smaller;">
             <tr><th>Valid</th></tr>
             <tr class="impair">
-              <td><a href="{"admin/valider.php"|url}">{insert name="mkStats"}</a></td>
+              <td><a href="{rel}/admin/valider.php">{insert name="mkStats"}</a></td>
             </tr>
           </table>
           {/perms}

diff --git a/templates/skin/newxorg.tpl b/templates/skin/newxorg.tpl
index c3ad976..8464b0b 100644 (file)
--- a/templates/skin/newxorg.tpl
+++ b/templates/skin/newxorg.tpl
@@ -55,10 +55,10 @@
     <table id="body" cellpadding="0" cellspacing="0">
       <tr>
         <td id="body-logo">
-          <a href="{rel}/events"><img src="{"images/sk_newxorg_logo.jpg"|url}" alt="[ LOGO ]" /></a>
+          <a href="{rel}/events"><img src="{rel}/images/sk_newxorg_logo.jpg" alt="[ LOGO ]" /></a>
         </td>
         <td id="body-top">
-          <a href="{rel}/events"><img src="{"images/sk_newxorg_ban.png"|url}" alt="[ Polytechnique.org ]" /></a>
+          <a href="{rel}/events"><img src="{rel}/images/sk_newxorg_ban.png" alt="[ Polytechnique.org ]" /></a>
           {include file="skin/common.title.header.tpl"}
         </td>
       </tr>
@@ -69,14 +69,14 @@
           <div class="menu_title">{$menu_title}</div>
           {/if}
           {foreach item=mi from=$menu_list}
-          <div class='menu_item'><a href="{$mi.url|url}">{$mi.text}</a></div>
+          <div class='menu_item'><a href="{$mi.url}">{$mi.text}</a></div>
           {/foreach}
           {/foreach}
           {perms level=admin}
           <table class="bicol" style="font-weight:normal;text-align:center; border-left:0px; border-right:0px; margin-top:0.5em; width:100%; margin-left: 0; font-size: smaller;">
             <tr><th>Valid</th></tr>
             <tr class="impair">
-              <td><a href="{"admin/valider.php"|url}">{insert name="mkStats"}</a></td>
+              <td><a href="{rel}/admin/valider.php">{insert name="mkStats"}</a></td>
             </tr>
           </table>
           {/perms}

diff --git a/templates/skin/oldtimes.tpl b/templates/skin/oldtimes.tpl
index 4126833..df84228 100644 (file)
--- a/templates/skin/oldtimes.tpl
+++ b/templates/skin/oldtimes.tpl
@@ -55,12 +55,12 @@
     <table id="body" cellpadding="0" cellspacing="0">
       <tr>
         <td id="body-logo">
-          <a href="{rel}/events"><img src="{"images/sk_oldtimes_logo.gif"|url}" alt="[ LOGO ]" /></a>
+          <a href="{rel}/events"><img src="{rel}/images/sk_oldtimes_logo.gif" alt="[ LOGO ]" /></a>
         </td>
         <td id="body-top">
-          <a href="{rel}/events"><img src="{"images/sk_oldtimes_ban.jpg"|url}" alt="[ Polytechnique.org ]" /></a>
+          <a href="{rel}/events"><img src="{rel}/images/sk_oldtimes_ban.jpg" alt="[ Polytechnique.org ]" /></a>
           {include file="skin/common.title.header.tpl"}
-          <a href="{rel}/events"><img src="{"images/sk_oldtimes_lesX.gif"|url}" alt="[LES X SUR LE WEB]" /></a>
+          <a href="{rel}/events"><img src="{rel}/images/sk_oldtimes_lesX.gif" alt="[LES X SUR LE WEB]" /></a>
         </td>
       </tr>
       <tr>
@@ -70,14 +70,14 @@
           <div class="menu_title">{$menu_title}</div>
           {/if}
           {foreach item=mi from=$menu_list}
-          <div class='menu_item'><a href="{$mi.url|url}">{$mi.text}</a></div>
+          <div class='menu_item'><a href="{$mi.url}">{$mi.text}</a></div>
           {/foreach}
           {/foreach}
           {perms level=admin}
           <table class="bicol" style="font-weight:normal;text-align:center; border-left:0px; border-right:0px; margin-top:0.5em; width:100%; margin-left: 0; font-size: smaller;">
             <tr><th>Valid</th></tr>
             <tr class="impair">
-              <td><a href="{"admin/valider.php"|url}">{insert name="mkStats"}</a></td>
+              <td><a href="{rel}/admin/valider.php">{insert name="mkStats"}</a></td>
             </tr>
           </table>
           {/perms}

diff --git a/templates/skin/openweb.tpl b/templates/skin/openweb.tpl
index bec2b93..9913479 100644 (file)
--- a/templates/skin/openweb.tpl
+++ b/templates/skin/openweb.tpl
@@ -68,7 +68,7 @@
           <div class="menu_title">{$menu_title}</div>
           {/if}
           {foreach item=mi from=$menu_list}
-          <a href="{$mi.url|url}">{$mi.text}</a>
+          <a href="{$mi.url}">{$mi.text}</a>
           {/foreach}
           {/foreach}
           {perms level=admin}

diff --git a/templates/skin/sharky.tpl b/templates/skin/sharky.tpl
index 3fb36e0..0edd7e7 100644 (file)
--- a/templates/skin/sharky.tpl
+++ b/templates/skin/sharky.tpl
@@ -55,10 +55,10 @@
     <table id="body" cellpadding="0" cellspacing="0">
       <tr>
         <td id="body-logo">
-          <a href="{rel}/events"><img src="{"images/sk_sharky_logo.png"|url}" alt="[ LOGO ]" /></a>
+          <a href="{rel}/events"><img src="{rel}/images/sk_sharky_logo.png" alt="[ LOGO ]" /></a>
         </td>
         <td id="body-top">
-          <a href="{rel}/events"><img src="{"images/sk_sharky_ban.png"|url}" alt="[ Polytechnique.org ]" /></a>
+          <a href="{rel}/events"><img src="{rel}/images/sk_sharky_ban.png" alt="[ Polytechnique.org ]" /></a>
           {include file="skin/common.title.header.tpl"}
         </td>
       </tr>
@@ -69,14 +69,14 @@
           <div class="menu_title">{$menu_title}</div>
           {/if}
           {foreach item=mi from=$menu_list}
-          <div class='menu_item'><a href="{$mi.url|url}">{$mi.text}</a></div>
+          <div class='menu_item'><a href="{$mi.url}">{$mi.text}</a></div>
           {/foreach}
           {/foreach}
           {perms level=admin}
           <table class="bicol" style="font-weight:normal;text-align:center; border-left:0px; border-right:0px; margin-top:0.5em; width:100%; margin-left: 0; font-size: smaller;">
             <tr><th>Valid</th></tr>
             <tr class="impair">
-              <td><a href="{"admin/valider.php"|url}">{insert name="mkStats"}</a></td>
+              <td><a href="{rel}/admin/valider.php">{insert name="mkStats"}</a></td>
             </tr>
           </table>
           {/perms}

diff --git a/templates/skin/spectral.tpl b/templates/skin/spectral.tpl
index 9b6fc9c..9a50352 100644 (file)
--- a/templates/skin/spectral.tpl
+++ b/templates/skin/spectral.tpl
@@ -55,12 +55,12 @@
     <table id="body" cellpadding="0" cellspacing="0">
       <tr>
         <td id="body-logo">
-          <a href="{rel}/events"><img src="{"images/sk_spectral_logo.gif"|url}" alt="[ LOGO ]" /></a>
+          <a href="{rel}/events"><img src="{rel}/images/sk_spectral_logo.gif" alt="[ LOGO ]" /></a>
         </td>
         <td id="body-top">
-          <a href="{rel}/events"><img src="{"images/sk_spectral_ban.jpg"|url}" alt="[ Polytechnique.org ]" /></a>
+          <a href="{rel}/events"><img src="{rel}/images/sk_spectral_ban.jpg" alt="[ Polytechnique.org ]" /></a>
           {include file="skin/common.title.header.tpl"}
-          <a href="{rel}/events"><img src="{"images/sk_spectral_lesX.jpg"|url}" alt="[LES X SUR LE WEB]" /></a>
+          <a href="{rel}/events"><img src="{rel}/images/sk_spectral_lesX.jpg" alt="[LES X SUR LE WEB]" /></a>
         </td>
       </tr>
       <tr>
@@ -70,14 +70,14 @@
           <div class="menu_title">{$menu_title}</div>
           {/if}
           {foreach item=mi from=$menu_list}
-          <div class='menu_item'><a href="{$mi.url|url}">{$mi.text}</a></div>
+          <div class='menu_item'><a href="{$mi.url}">{$mi.text}</a></div>
           {/foreach}
           {/foreach}
           {perms level=admin}
           <table class="bicol" style="font-weight:normal;text-align:center; border-left:0px; border-right:0px; margin-top:0.5em; width:100%; margin-left: 0; font-size: smaller;">
             <tr><th>Valid</th></tr>
             <tr class="impair">
-              <td><a href="{"admin/valider.php"|url}">{insert name="mkStats"}</a></td>
+              <td><a href="{rel}/admin/valider.php">{insert name="mkStats"}</a></td>
             </tr>
           </table>
           {/perms}

diff --git a/templates/skin/trapped.tpl b/templates/skin/trapped.tpl
index c1ca1ce..b4717cc 100644 (file)
--- a/templates/skin/trapped.tpl
+++ b/templates/skin/trapped.tpl
@@ -55,12 +55,12 @@
     <table id="body" cellpadding="0" cellspacing="0">
       <tr>
         <td id="body-logo">
-          <a href="{rel}/events"><img src="{"images/sk_trapped_logo.gif"|url}" alt="[ LOGO ]" /></a>
+          <a href="{rel}/events"><img src="{rel}/images/sk_trapped_logo.gif" alt="[ LOGO ]" /></a>
         </td>
         <td id="body-top">
-          <a href="{rel}/events"><img src="{"images/sk_trapped_ban.jpg"|url}" alt="[ Polytechnique.org ]" /></a>
+          <a href="{rel}/events"><img src="{rel}/images/sk_trapped_ban.jpg" alt="[ Polytechnique.org ]" /></a>
           {include file="skin/common.title.header.tpl"}
-          <a href="{rel}/events"><img src="{"images/sk_trapped_lesX.gif"|url}" alt="[LES X SUR LE WEB]" /></a>
+          <a href="{rel}/events"><img src="{rel}/images/sk_trapped_lesX.gif" alt="[LES X SUR LE WEB]" /></a>
         </td>
       </tr>
       <tr>
@@ -70,14 +70,14 @@
           <div class="menu_title">{$menu_title}</div>
           {/if}
           {foreach item=mi from=$menu_list}
-          <div class='menu_item'><a href="{$mi.url|url}">{$mi.text}</a></div>
+          <div class='menu_item'><a href="{$mi.url}">{$mi.text}</a></div>
           {/foreach}
           {/foreach}
           {perms level=admin}
           <table class="bicol" style="font-weight:normal;text-align:center; border-left:0px; border-right:0px; margin-top:0.5em; width:100%; margin-left: 0; font-size: smaller;">
             <tr><th>Valid</th></tr>
             <tr class="impair">
-              <td><a href="{"admin/valider.php"|url}">{insert name="mkStats"}</a></td>
+              <td><a href="{rel}/admin/valider.php">{insert name="mkStats"}</a></td>
             </tr>
           </table>
           {/perms}

diff --git a/templates/stats/stats_promo.tpl b/templates/stats/stats_promo.tpl
deleted file mode 100644 (file)
index 2f970ef..0000000
--- a/templates/stats/stats_promo.tpl
+++ /dev/null
@@ -1,36 +0,0 @@
-{**************************************************************************}
-{*                                                                        *}
-{*  Copyright (C) 2003-2006 Polytechnique.org                             *}
-{*  http://opensource.polytechnique.org/                                  *}
-{*                                                                        *}
-{*  This program is free software; you can redistribute it and/or modify  *}
-{*  it under the terms of the GNU General Public License as published by  *}
-{*  the Free Software Foundation; either version 2 of the License, or     *}
-{*  (at your option) any later version.                                   *}
-{*                                                                        *}
-{*  This program is distributed in the hope that it will be useful,       *}
-{*  but WITHOUT ANY WARRANTY; without even the implied warranty of        *}
-{*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *}
-{*  GNU General Public License for more details.                          *}
-{*                                                                        *}
-{*  You should have received a copy of the GNU General Public License     *}
-{*  along with this program; if not, write to the Free Software           *}
-{*  Foundation, Inc.,                                                     *}
-{*  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA               *}
-{*                                                                        *}
-{**************************************************************************}
-
-
-<h1>
-  Statistiques de la promotion {$promo}
-</h1>
-
-<h2>
-  Nombre d'inscrits de la promotion {$promo}
-</h2>
-
-<div class="center">
-  <img src="{"stats/graph_promo.php?promo=$promo"|url}" alt=" [ INSCRITS ] " />
-</div>
-
-{* vim:set et sw=2 sts=2 sws=2: *}

diff --git a/templates/webredirect.tpl b/templates/webredirect.tpl
index 9b00a09..6358acb 100644 (file)
--- a/templates/webredirect.tpl
+++ b/templates/webredirect.tpl
@@ -30,7 +30,7 @@
     les adresses <strong>http://{#globals.webredirect.domain#}/{$smarty.session.bestalias}</strong>
   et <strong>http://{#globals.webredirect.domain#}/{$smarty.session.forlife}</strong>
     vers la page WEB de ton choix. Pour de plus amples détails, consulte
-  <a href="{"docs/doc_carva.php"|url}">cette page</a>
+  <a href="{rel}/Docs/MaRedirectionDePageWEB">cette page</a>
 </p>
 
 <h2>Conditions d'usage</h2>
@@ -38,7 +38,7 @@
   L'utilisateur s'engage à ce que le contenu du site référencé soit en conformité
   avec les lois et règlements en vigueur et d'une manière générale ne porte pas
   atteinte aux droits des tiers
-  (<a href="{"docs/doc_carva.php#charte"|url}">plus de précisions</a>).
+  (<a href="{rel}/Docs/MaRedirectionDePageWEB#charte">plus de précisions</a>).
 </p>
 
 <h1>