informations on aliases, no edit capacity atm

diff --git a/htdocs/admin/utilisateurs.php b/htdocs/admin/utilisateurs.php
index 68f6465..ad9c993 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.10 2004-09-01 18:02:00 x2000habouzit Exp $
+        $Id: utilisateurs.php,v 1.11 2004-09-01 21:15:00 x2000habouzit Exp $
  ***************************************************************************/
 
 require("auto.prepend.inc.php");
@@ -207,17 +207,18 @@ if (!empty($_REQUEST['select'])) {
                 WHERE num != 0 AND uid = {$mr['user_id']} order by num";
         $result=$globals->db->query($sql);
         $xorgmails = Array();
-        $email_panne = "";
+        $email_panne = Array();
         while($l = mysql_fetch_assoc($result)) {
             $xorgmails[] = $l;
             if($l['panne']!="0000-00-00")
-                $email_panne .= "Adresse {$l['email']} signalée comme HS le {$l['panne']}<br />";
+                $email_panne[] = "Adresse {$l['email']} signalée comme HS le {$l['panne']}";
             $next_num = $l['num']+1;
         }
         mysql_free_result($result);
-        
+       
+       $page->mysql_assign("SELECT alias FROM aliases WHERE id = {$mr["user_id"]}", 'aliases');
         $page->assign_by_ref('xorgmails', $xorgmails);
-        $page->assign('email_panne', $email_panne);
+        $page->assign_by_ref('email_panne', $email_panne);
         $page->assign('next_num', $next_num);
     } // if(mysql_fetch_row)
 }

diff --git a/templates/admin/utilisateurs.tpl b/templates/admin/utilisateurs.tpl
index ab94b01..11cc24b 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.9 2004-09-01 18:46:21 x2000habouzit Exp $
+        $Id: utilisateurs.tpl,v 1.10 2004-09-01 21:15:00 x2000habouzit Exp $
  ***************************************************************************}
 
 
@@ -168,17 +168,18 @@ depuis <strong>{$mr.host}</strong>
         <a href="admin_trombino.php?uid={$mr.user_id}">[Trombino]</a>
       </td>
     </tr>
-    <tr> 
-      <th class="alias">
-        Alias e-mail
+    <tr>
+      <th class="alias" colspan="2">
+        Adresses e-mail
       </th>
-      <td class="alias"> 
-        <input type="text" name="alias" size="20" maxlength="255" value="{$mr.alias}" />@m4x.org
-      </td>
-      <td class="action">
-        &nbsp;
-      </td>
+      <td class="action">&nbsp;</td>
+    </tr>
+    {foreach from=$aliases item=a}
+    <tr>
+      <td class="alias" colspan="2">{$a.alias}@polytechnique.org</td>
+      <td class="action">&nbsp;</td>
     </tr>
+    {/foreach}
     {foreach item=mail from=$xorgmails}
     <tr> 
       <th class="detail"> 
@@ -214,7 +215,9 @@ depuis <strong>{$mr.host}</strong>
   </table>
 </form>
 <p class="erreur">
-{$email_panne}
+{foreach from=$email_panne item=e}
+{$p}<br />
+{/foreach}
 </p>
 {/dynamic}
 {* vim:set et sw=2 sts=2 sws=2: *}