From 42d9575b7ec27f6fe52157985be5b9784c68f98f Mon Sep 17 00:00:00 2001 From: x2000habouzit Date: Mon, 17 Jul 2006 14:17:03 +0000 Subject: [PATCH] drop url modifier \o/ git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@532 839d8a87-29fc-0310-9880-83ba4fa771e5 --- include/xorg/menu.inc.php | 14 ++++++++++++-- plugins/modifier.url.php | 29 ----------------------------- templates/admin/lists.tpl | 2 +- templates/carnet/mescontacts.tpl | 2 +- templates/carnet/notifs.tpl | 4 ++-- templates/carnet/panel.tpl | 2 +- templates/include/flags.radio.tpl | 2 +- templates/listes/options.tpl | 2 +- templates/marketing/promo.tpl | 2 +- templates/profil/adresses.tpl | 2 +- templates/profil/emploi.tpl | 2 +- templates/profil/general.tpl | 6 +++--- templates/profil/skill.tpl | 2 +- templates/skin/default.tpl | 2 +- templates/skin/espace.tpl | 10 +++++----- templates/skin/humlinux.tpl | 8 ++++---- templates/skin/linux.tpl | 10 +++++----- templates/skin/liteskin.tpl | 8 ++++---- templates/skin/nbviolet.tpl | 10 +++++----- templates/skin/newxorg.tpl | 8 ++++---- templates/skin/oldtimes.tpl | 10 +++++----- templates/skin/openweb.tpl | 2 +- templates/skin/sharky.tpl | 8 ++++---- templates/skin/spectral.tpl | 10 +++++----- templates/skin/trapped.tpl | 10 +++++----- templates/stats/stats_promo.tpl | 36 ------------------------------------ templates/webredirect.tpl | 4 ++-- 27 files changed, 76 insertions(+), 131 deletions(-) delete mode 100644 plugins/modifier.url.php delete mode 100644 templates/stats/stats_promo.tpl diff --git a/include/xorg/menu.inc.php b/include/xorg/menu.inc.php index 41c9e45..0d5b4b8 100644 --- 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 index 2dcb4b8..0000000 --- a/plugins/modifier.url.php +++ /dev/null @@ -1,29 +0,0 @@ -baseurl."/".$string; -} -?> diff --git a/templates/admin/lists.tpl b/templates/admin/lists.tpl index 7e56fb1..3c9e07d 100644 --- a/templates/admin/lists.tpl +++ b/templates/admin/lists.tpl @@ -31,7 +31,7 @@ {foreach from=$listes item=l} - {$l} + {$l} {/foreach} diff --git a/templates/carnet/mescontacts.tpl b/templates/carnet/mescontacts.tpl index debf8d0..3dfdb59 100644 --- a/templates/carnet/mescontacts.tpl +++ b/templates/carnet/mescontacts.tpl @@ -36,7 +36,7 @@

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 ajout contact en face de son nom dans les résultats ! + il te suffit de cliquer sur l'icône ajout contact en face de son nom dans les résultats !

{if $trombi || $citer->total()} diff --git a/templates/carnet/notifs.tpl b/templates/carnet/notifs.tpl index 46c962d..85c3165 100644 --- 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

Pour surveiller des membres non-inscrits, il faut passer par la recherche -et cliquer sur les icones Ajouter pour les ajouter à cette liste +et cliquer sur les icones Ajouter pour les ajouter à cette liste

@@ -115,7 +115,7 @@ et cliquer sur les icones Ajouter diff --git a/templates/carnet/panel.tpl b/templates/carnet/panel.tpl index 60028d3..627e7fa 100644 --- a/templates/carnet/panel.tpl +++ b/templates/carnet/panel.tpl @@ -70,7 +70,7 @@ Il faut pour cel {if !$promo[row].contact} {* - *}ajouter à mes contacts{* + *}ajouter à mes contacts{* *} {/if} {else} diff --git a/templates/include/flags.radio.tpl b/templates/include/flags.radio.tpl index 8e3f2df..b05081f 100644 --- a/templates/include/flags.radio.tpl +++ b/templates/include/flags.radio.tpl @@ -43,7 +43,7 @@ prive
- Quelle couleur ?? + Quelle couleur ??
diff --git a/templates/listes/options.tpl b/templates/listes/options.tpl index 84442ab..138f296 100644 --- 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} - retirer de la whitelist + retirer de la whitelist
{/foreach} {else} diff --git a/templates/marketing/promo.tpl b/templates/marketing/promo.tpl index d0d35fc..3f62847 100644 --- a/templates/marketing/promo.tpl +++ b/templates/marketing/promo.tpl @@ -37,7 +37,7 @@
- + Voir l'évolution des inscriptions de la promotion
diff --git a/templates/profil/adresses.tpl b/templates/profil/adresses.tpl index febaf6d..02a5110 100644 --- 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} Adresse: diff --git a/templates/profil/emploi.tpl b/templates/profil/emploi.tpl index f288814..7d5f74a 100644 --- a/templates/profil/emploi.tpl +++ b/templates/profil/emploi.tpl @@ -217,7 +217,7 @@ Curriculum vitae
Le CV n'est jamais public.
- Comment remplir mon CV ? + Comment remplir mon CV ? diff --git a/templates/profil/general.tpl b/templates/profil/general.tpl index 3cd6652..2e19d12 100644 --- a/templates/profil/general.tpl +++ b/templates/profil/general.tpl @@ -282,7 +282,7 @@ privé - Quelle couleur ?? + Quelle couleur ?? @@ -308,7 +308,7 @@ site public - Quelle couleur ?? + Quelle couleur ?? @@ -334,7 +334,7 @@ site public - Quelle couleur ?? + Quelle couleur ?? diff --git a/templates/profil/skill.tpl b/templates/profil/skill.tpl index 272fdea..216ea0d 100644 --- a/templates/profil/skill.tpl +++ b/templates/profil/skill.tpl @@ -169,7 +169,7 @@ Niveau - Quel niveau ? + Quel niveau ? {foreach from=$langue_name item=name key=i} diff --git a/templates/skin/default.tpl b/templates/skin/default.tpl index 34ee9fd..45c2234 100644 --- a/templates/skin/default.tpl +++ b/templates/skin/default.tpl @@ -68,7 +68,7 @@
{$menu_title}
{/if} {foreach item=mi from=$menu_list} -
{$mi.text}
+
{$mi.text}
{/foreach} {/foreach} {perms level=admin} diff --git a/templates/skin/espace.tpl b/templates/skin/espace.tpl index 0828526..595959c 100644 --- a/templates/skin/espace.tpl +++ b/templates/skin/espace.tpl @@ -55,12 +55,12 @@ @@ -70,14 +70,14 @@
{$menu_title}
{/if} {foreach item=mi from=$menu_list} -
{$mi.text}
+
{$mi.text}
{/foreach} {/foreach} {perms level=admin}
- [ Polytechnique.org ] + [ Polytechnique.org ] {include file="skin/common.title.header.tpl"} - [LES X SUR LE WEB] + [LES X SUR LE WEB]
- +
Valid
{insert name="mkStats"}{insert name="mkStats"}
{/perms} diff --git a/templates/skin/humlinux.tpl b/templates/skin/humlinux.tpl index 9d0fc81..5dcc065 100644 --- a/templates/skin/humlinux.tpl +++ b/templates/skin/humlinux.tpl @@ -55,10 +55,10 @@ @@ -69,14 +69,14 @@
{$menu_title}
{/if} {foreach item=mi from=$menu_list} -
{$mi.text}
+
{$mi.text}
{/foreach} {/foreach} {perms level=admin}
- [LES X SUR LE WEB] + [LES X SUR LE WEB] {include file="skin/common.title.header.tpl"}
- +
Valid
{insert name="mkStats"}{insert name="mkStats"}
{/perms} diff --git a/templates/skin/linux.tpl b/templates/skin/linux.tpl index c371c7d..2154382 100644 --- a/templates/skin/linux.tpl +++ b/templates/skin/linux.tpl @@ -55,12 +55,12 @@ @@ -70,14 +70,14 @@
{$menu_title}
{/if} {foreach item=mi from=$menu_list} -
{$mi.text}
+
{$mi.text}
{/foreach} {/foreach} {perms level=admin}
- [ Polytechnique.org ] + [ Polytechnique.org ] {include file="skin/common.title.header.tpl"} - [LES X SUR LE WEB] + [LES X SUR LE WEB]
- +
Valid
{insert name="mkStats"}{insert name="mkStats"}
{/perms} diff --git a/templates/skin/liteskin.tpl b/templates/skin/liteskin.tpl index 31cc624..882a162 100644 --- a/templates/skin/liteskin.tpl +++ b/templates/skin/liteskin.tpl @@ -55,10 +55,10 @@ @@ -69,14 +69,14 @@
{$menu_title}
{/if} {foreach item=mi from=$menu_list} -
{$mi.text}
+
{$mi.text}
{/foreach} {/foreach} {perms level=admin}
- [ Polytechnique.org ] + [ Polytechnique.org ] {include file="skin/common.title.header.tpl"}
- +
Valid
{insert name="mkStats"}{insert name="mkStats"}
{/perms} diff --git a/templates/skin/nbviolet.tpl b/templates/skin/nbviolet.tpl index 56ea229..41995b1 100644 --- a/templates/skin/nbviolet.tpl +++ b/templates/skin/nbviolet.tpl @@ -55,12 +55,12 @@ @@ -70,14 +70,14 @@
{$menu_title}
{/if} {foreach item=mi from=$menu_list} -
{$mi.text}
+
{$mi.text}
{/foreach} {/foreach} {perms level=admin}
- [ Polytechnique.org ] + [ Polytechnique.org ] {include file="skin/common.title.header.tpl"} - [LES X SUR LE WEB] + [LES X SUR LE WEB]
- +
Valid
{insert name="mkStats"}{insert name="mkStats"}
{/perms} diff --git a/templates/skin/newxorg.tpl b/templates/skin/newxorg.tpl index c3ad976..8464b0b 100644 --- a/templates/skin/newxorg.tpl +++ b/templates/skin/newxorg.tpl @@ -55,10 +55,10 @@ @@ -69,14 +69,14 @@
{$menu_title}
{/if} {foreach item=mi from=$menu_list} -
{$mi.text}
+
{$mi.text}
{/foreach} {/foreach} {perms level=admin}
- [ Polytechnique.org ] + [ Polytechnique.org ] {include file="skin/common.title.header.tpl"}
- +
Valid
{insert name="mkStats"}{insert name="mkStats"}
{/perms} diff --git a/templates/skin/oldtimes.tpl b/templates/skin/oldtimes.tpl index 4126833..df84228 100644 --- a/templates/skin/oldtimes.tpl +++ b/templates/skin/oldtimes.tpl @@ -55,12 +55,12 @@ @@ -70,14 +70,14 @@
{$menu_title}
{/if} {foreach item=mi from=$menu_list} -
{$mi.text}
+
{$mi.text}
{/foreach} {/foreach} {perms level=admin}
- [ Polytechnique.org ] + [ Polytechnique.org ] {include file="skin/common.title.header.tpl"} - [LES X SUR LE WEB] + [LES X SUR LE WEB]
- +
Valid
{insert name="mkStats"}{insert name="mkStats"}
{/perms} diff --git a/templates/skin/openweb.tpl b/templates/skin/openweb.tpl index bec2b93..9913479 100644 --- a/templates/skin/openweb.tpl +++ b/templates/skin/openweb.tpl @@ -68,7 +68,7 @@
{$menu_title}
{/if} {foreach item=mi from=$menu_list} - {$mi.text} + {$mi.text} {/foreach} {/foreach} {perms level=admin} diff --git a/templates/skin/sharky.tpl b/templates/skin/sharky.tpl index 3fb36e0..0edd7e7 100644 --- a/templates/skin/sharky.tpl +++ b/templates/skin/sharky.tpl @@ -55,10 +55,10 @@ @@ -69,14 +69,14 @@
{$menu_title}
{/if} {foreach item=mi from=$menu_list} -
{$mi.text}
+
{$mi.text}
{/foreach} {/foreach} {perms level=admin}
- [ Polytechnique.org ] + [ Polytechnique.org ] {include file="skin/common.title.header.tpl"}
- +
Valid
{insert name="mkStats"}{insert name="mkStats"}
{/perms} diff --git a/templates/skin/spectral.tpl b/templates/skin/spectral.tpl index 9b6fc9c..9a50352 100644 --- a/templates/skin/spectral.tpl +++ b/templates/skin/spectral.tpl @@ -55,12 +55,12 @@ @@ -70,14 +70,14 @@
{$menu_title}
{/if} {foreach item=mi from=$menu_list} -
{$mi.text}
+
{$mi.text}
{/foreach} {/foreach} {perms level=admin}
- [ Polytechnique.org ] + [ Polytechnique.org ] {include file="skin/common.title.header.tpl"} - [LES X SUR LE WEB] + [LES X SUR LE WEB]
- +
Valid
{insert name="mkStats"}{insert name="mkStats"}
{/perms} diff --git a/templates/skin/trapped.tpl b/templates/skin/trapped.tpl index c1ca1ce..b4717cc 100644 --- a/templates/skin/trapped.tpl +++ b/templates/skin/trapped.tpl @@ -55,12 +55,12 @@ @@ -70,14 +70,14 @@
{$menu_title}
{/if} {foreach item=mi from=$menu_list} -
{$mi.text}
+
{$mi.text}
{/foreach} {/foreach} {perms level=admin}
- [ Polytechnique.org ] + [ Polytechnique.org ] {include file="skin/common.title.header.tpl"} - [LES X SUR LE WEB] + [LES X SUR LE WEB]
- +
Valid
{insert name="mkStats"}{insert name="mkStats"}
{/perms} diff --git a/templates/stats/stats_promo.tpl b/templates/stats/stats_promo.tpl deleted file mode 100644 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 *} -{* *} -{**************************************************************************} - - -

- Statistiques de la promotion {$promo} -

- -

- Nombre d'inscrits de la promotion {$promo} -

- -
- [ INSCRITS ] -
- -{* vim:set et sw=2 sts=2 sws=2: *} diff --git a/templates/webredirect.tpl b/templates/webredirect.tpl index 9b00a09..6358acb 100644 --- a/templates/webredirect.tpl +++ b/templates/webredirect.tpl @@ -30,7 +30,7 @@ les adresses http://{#globals.webredirect.domain#}/{$smarty.session.bestalias} et http://{#globals.webredirect.domain#}/{$smarty.session.forlife} vers la page WEB de ton choix. Pour de plus amples détails, consulte - cette page + cette page

Conditions d'usage

@@ -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 - (plus de précisions). + (plus de précisions).

-- 2.1.4