some reformat

diff --git a/htdocs/admin/utilisateurs.php b/htdocs/admin/utilisateurs.php
index 2d17e25..8587264 100644 (file)
--- a/htdocs/admin/utilisateurs.php
+++ b/htdocs/admin/utilisateurs.php
@@ -18,7 +18,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: utilisateurs.php,v 1.13 2004-09-01 23:06:49 x2000habouzit Exp $
+        $Id: utilisateurs.php,v 1.14 2004-09-02 09:47:07 x2000habouzit Exp $
  ***************************************************************************/
 
 require("auto.prepend.inc.php");
@@ -215,7 +215,7 @@ if (!empty($_REQUEST['select'])) {
         }
         mysql_free_result($result);
        
-       $page->mysql_assign("SELECT alias FROM aliases WHERE id = {$mr["user_id"]}", 'aliases');
+       $page->mysql_assign("SELECT alias, type='login' AS for_life FROM aliases WHERE id = {$mr["user_id"]} ORDER BY type!= 'login'", 'aliases');
         $page->assign_by_ref('xorgmails', $xorgmails);
         $page->assign_by_ref('email_panne', $email_panne);
         $page->assign('next_num', $next_num);

diff --git a/templates/admin/utilisateurs.tpl b/templates/admin/utilisateurs.tpl
index 11cc24b..c08ba0c 100644 (file)
--- a/templates/admin/utilisateurs.tpl
+++ b/templates/admin/utilisateurs.tpl
@@ -17,7 +17,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: utilisateurs.tpl,v 1.10 2004-09-01 21:15:00 x2000habouzit Exp $
+        $Id: utilisateurs.tpl,v 1.11 2004-09-02 09:47:07 x2000habouzit Exp $
  ***************************************************************************}
 
 
@@ -170,16 +170,23 @@ depuis <strong>{$mr.host}</strong>
     </tr>
     <tr>
       <th class="alias" colspan="2">
-        Adresses e-mail
+        Alias e-mail
       </th>
       <td class="action">&nbsp;</td>
     </tr>
     {foreach from=$aliases item=a}
     <tr>
-      <td class="alias" colspan="2">{$a.alias}@polytechnique.org</td>
+      <th class="detail">{if $a.for_life}garantie à vie*{/if}</th>
+      <td class="detail">{if $a.for_life}<strong>{$a.alias}</strong>{else}{$a.alias}{/if}</td>
       <td class="action">&nbsp;</td>
     </tr>
     {/foreach}
+    <tr>
+      <th class="alias" colspan="2">
+        Redirections
+      </th>
+      <td class="action">&nbsp;</td>
+    </tr>
     {foreach item=mail from=$xorgmails}
     <tr> 
       <th class="detail"> 
@@ -214,6 +221,9 @@ depuis <strong>{$mr.host}</strong>
     </tr>
   </table>
 </form>
+<p>
+<strong>* à ne modifier qu'avec l'accord express de l'utilisateur !!!</strong>
+</p>
 <p class="erreur">
 {foreach from=$email_panne item=e}
 {$p}<br />