fix pl links

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

diff --git a/modules/admin.php b/modules/admin.php
index f403992..9ab54fa 100644 (file)
--- a/modules/admin.php
+++ b/modules/admin.php
@@ -29,7 +29,7 @@ class AdminModule extends PLModule
             'admin/postfix/regexp_bounces' => $this->make_hook('postfix_regexpsbounces', AUTH_MDP, 'admin'),
             'admin/logger'                 => $this->make_hook('logger', AUTH_MDP, 'admin'),
             'admin/logger/actions'         => $this->make_hook('logger_action', AUTH_MDP, 'admin'),
-            'admin/users'                  => $this->make_hook('user', AUTH_MDP, 'admin'),
+            'admin/user'                  => $this->make_hook('user', AUTH_MDP, 'admin'),
             'admin/homonyms'               => $this->make_hook('homonyms', AUTH_MDP, 'admin'),
             'admin/ax-xorg'                => $this->make_hook('ax_xorg', AUTH_MDP, 'admin'),
             'admin/deaths'                 => $this->make_hook('deaths', AUTH_MDP, 'admin'),

diff --git a/templates/admin/homonymes.tpl b/templates/admin/homonymes.tpl
index 19100db..5e6c82d 100644 (file)
--- a/templates/admin/homonymes.tpl
+++ b/templates/admin/homonymes.tpl
@@ -59,7 +59,7 @@
     <td>{$user.expire|date_format}</td>
     <td>
       <a href="profile/{$user.forlife}" class='popup2'>fiche</a>
-      <a href="admin/users/{$user.forlife}">edit</a>
+      <a href="admin/user/{$user.forlife}">edit</a>
       {if $user.type eq 'alias'}
       <a href="admin/homonyms/mail-conf/{$user.user_id}">mailer</a>
       <a href="admin/homonyms/correct-conf/{$user.user_id}">corriger</a>

diff --git a/templates/admin/index.tpl b/templates/admin/index.tpl
index 6512257..b017ba5 100644 (file)
--- a/templates/admin/index.tpl
+++ b/templates/admin/index.tpl
@@ -53,7 +53,7 @@
   <tr class="impair">
     <td>
       <strong>Utilisateurs :</strong>&nbsp;&nbsp;
-      <a href="admin/users">Edit/Su/Logs</a>
+      <a href="admin/user">Edit/Su/Logs</a>
       &nbsp;&nbsp;|&nbsp;&nbsp;
       <a href="admin/homonyms">Homonymes</a>
       &nbsp;&nbsp;|&nbsp;&nbsp;

diff --git a/templates/admin/utilisateurs.tpl b/templates/admin/utilisateurs.tpl
index 40063a2..4f66fc0 100644 (file)
--- a/templates/admin/utilisateurs.tpl
+++ b/templates/admin/utilisateurs.tpl
@@ -33,7 +33,7 @@ Attention, d
 
 
 {if $smarty.post.u_kill_conf}
-<form method="post" action="admin/users">
+<form method="post" action="admin/user">
   <div class="center">
     <input type="hidden" name="user_id" value="{$smarty.request.user_id}" />
     Confirmer la suppression de {$smarty.request.user_id}&nbsp;&nbsp;
@@ -42,7 +42,7 @@ Attention, d
 </form>
 {else}
 
-<form method="post" action="admin/users">
+<form method="post" action="admin/user">
   <table class="tinybicol" cellspacing="0" cellpadding="2">
     <tr>
       <th>
@@ -109,7 +109,7 @@ function act_fwd(fwd, activate) {
 </script>
 {/literal}
 
-<form id="auth" method="post" action="admin/users">
+<form id="auth" method="post" action="admin/user">
   <table cellspacing="0" cellpadding="2" class="tinybicol">
     <tr>
       <th>
@@ -222,7 +222,7 @@ function act_fwd(fwd, activate) {
 Ne pas utiliser [Désinscrire] si le but est d'exclure la personne.
 Pour ceci changer ses permissions en 'disabled'.
 </p>
-<form id="alias" method="post" action="admin/users">
+<form id="alias" method="post" action="admin/user">
   <table class="tinybicol" cellpadding="2" cellspacing="0">
     <tr>
       <th class="alias" colspan="2">
@@ -262,7 +262,7 @@ Pour ceci changer ses permissions en 'disabled'.
 <strong>* à ne modifier qu'avec l'accord express de l'utilisateur !!!</strong>
 </p>
 
-<form id="fwds" method="post" action="admin/users#fwds">
+<form id="fwds" method="post" action="admin/user#fwds">
   <table class="bicol" cellpadding="2" cellspacing="0">
     <tr>
       <th colspan="4">

diff --git a/templates/carnet/mescontacts.tpl b/templates/carnet/mescontacts.tpl
index 64b9725..04d9653 100644 (file)
--- a/templates/carnet/mescontacts.tpl
+++ b/templates/carnet/mescontacts.tpl
@@ -26,7 +26,7 @@
   Ma liste personnelle de contacts
 </h1>
 
-<form action="{$smarty.server.REQUEST_URI}" method="post">
+<form action="carnet/contacts" method="post">
 <p>
   Ajouter la personne suivante à ma liste de contacts (prenom.nom) :<br />
   <input type="hidden" name="action" value="ajouter" />

diff --git a/templates/carnet/tricontacts.tpl b/templates/carnet/tricontacts.tpl
index 6fdabc1..d08eb75 100644 (file)
--- a/templates/carnet/tricontacts.tpl
+++ b/templates/carnet/tricontacts.tpl
@@ -24,19 +24,19 @@
 <p>
 Trier par :
 {if ($order eq 'nom') and not($smarty.request.inv)}
-[<a href='carnet/contact?order=nom&amp;trombi={$smarty.request.trombi}&amp;inv=1'><strong>nom <img src='images/dn.png' alt='decr.' /></strong></a>]
+[<a href='carnet/contacts?order=nom&amp;trombi={$smarty.request.trombi}&amp;inv=1'><strong>nom <img src='images/dn.png' alt='decr.' /></strong></a>]
 {else}
-[<a href='carnet/contact?order=nom&amp;trombi={$smarty.request.trombi}'>{if ($order eq 'nom')}<strong>nom <img src='images/up.png' alt='crois.' /></strong>{else}nom{/if}</a>]
+[<a href='carnet/contacts?order=nom&amp;trombi={$smarty.request.trombi}'>{if ($order eq 'nom')}<strong>nom <img src='images/up.png' alt='crois.' /></strong>{else}nom{/if}</a>]
 {/if}
 {if ($order eq 'promo') and ($smarty.request.inv)}
-[<a href='carnet/contact?order=promo&amp;trombi={$smarty.request.trombi}'><strong>promo <img src='images/up.png' alt='decr.' /></strong></a>]
+[<a href='carnet/contacts?order=promo&amp;trombi={$smarty.request.trombi}'><strong>promo <img src='images/up.png' alt='decr.' /></strong></a>]
 {else}
-[<a href='carnet/contact?order=promo&amp;trombi={$smarty.request.trombi}&amp;inv=1'>{if ($order eq 'promo')}<strong>promo <img src='images/dn.png' alt='crois.' /></strong>{else}promo{/if}</a>]
+[<a href='carnet/contacts?order=promo&amp;trombi={$smarty.request.trombi}&amp;inv=1'>{if ($order eq 'promo')}<strong>promo <img src='images/dn.png' alt='crois.' /></strong>{else}promo{/if}</a>]
 {/if}
 {if ($order eq 'last') and ($smarty.request.inv)}
-[<a href='carnet/contact?order=last&amp;trombi={$smarty.request.trombi}'><strong>dernière modification <img src='images/up.png' alt='decr.' /></strong></a>]
+[<a href='carnet/contacts?order=last&amp;trombi={$smarty.request.trombi}'><strong>dernière modification <img src='images/up.png' alt='decr.' /></strong></a>]
 {else}
-[<a href='carnet/contact?order=last&amp;trombi={$smarty.request.trombi}&amp;inv=1'>{if ($order eq 'last')}<strong>dernière modification <img src='images/dn.png'i alt='crois.' /></strong>{else}dernière modification{/if}</a>]
+[<a href='carnet/contacts?order=last&amp;trombi={$smarty.request.trombi}&amp;inv=1'>{if ($order eq 'last')}<strong>dernière modification <img src='images/dn.png'i alt='crois.' /></strong>{else}dernière modification{/if}</a>]
 {/if}
 </p>
 

diff --git a/templates/fiche.tpl b/templates/fiche.tpl
index 9b8415f..10ec182 100644 (file)
--- a/templates/fiche.tpl
+++ b/templates/fiche.tpl
@@ -54,7 +54,7 @@ function chgMainWinLoc( strPage ) {
           {icon name=cross title="Retirer de mes contacts"}</a>
         {/if}
         {if $smarty.session.perms eq admin}
-        <a href="javascript:x()" onclick="chgMainWinLoc('admin/utilisateurs.php?login={$x.forlife}')">
+        <a href="javascript:x()" onclick="chgMainWinLoc('admin/user/{$x.forlife}')">
           {icon name=wrench title="administrer user"}</a>
         {/if}
         {/if}

diff --git a/templates/include/minifiche.tpl b/templates/include/minifiche.tpl
index 70ffde7..5bb6ef6 100644 (file)
--- a/templates/include/minifiche.tpl
+++ b/templates/include/minifiche.tpl
@@ -77,7 +77,7 @@
         [<a href="marketing/private/{$c.user_id}">{*
           *}{icon name=wrench title="marketter user"}</a>
       {elseif $c.wasinscrit}
-        [<a href="admin/utilisateurs.php?login={$c.forlife}">{*
+        [<a href="admin/user/{$c.forlife}">{*
           *}{icon name=wrench title="administrer user"}</a>
       {/if}
       <a href="http://www.polytechniciens.com/index.php?page=AX_FICHE_ANCIEN&amp;anc_id={$c.matricule_ax}">{*