Show user's melix in administration page

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

diff --git a/modules/admin.php b/modules/admin.php
index a70bcd3..ab1a129 100644 (file)
--- a/modules/admin.php
+++ b/modules/admin.php
@@ -357,12 +357,12 @@ class AdminModule extends PLModule
         }
 
         if (Env::has('user_id')) {
-            $login = get_user_login(Env::i('user_id'));
+            $login = get_user_forlife(Env::i('user_id'));
             if (empty($login)) {
                 $login = Env::i('user_id');
             }
         } elseif (Env::has('login')) {
-            $login = get_user_login(Env::v('login'));
+            $login = get_user_forlife(Env::v('login'));
         }
 
         if(Env::has('logs_button') && $login) {
@@ -531,6 +531,14 @@ class AdminModule extends PLModule
             $page->assign('lastlogin', $lastlogin);
             $page->assign('host', $host);
 
+            $res = XDB::query("SELECT  alias
+                                 FROM  virtual
+                           INNER JOIN  virtual_redirect USING(vid)
+                                WHERE  type = 'user' AND redirect LIKE '" . $login . "@%'");
+            if ($res->numRows()) {
+                $page->assign('virtual', $res->fetchOneCell());
+            }
+
             $page->assign('aliases', XDB::iterator(
                         "SELECT  alias, type='a_vie' AS for_life,FIND_IN_SET('bestalias',flags) AS best,expire
                            FROM  aliases

diff --git a/templates/admin/utilisateurs.tpl b/templates/admin/utilisateurs.tpl
index 74b0ada..17e51d9 100644 (file)
--- a/templates/admin/utilisateurs.tpl
+++ b/templates/admin/utilisateurs.tpl
@@ -252,7 +252,7 @@ Pour ceci changer ses permissions en 'disabled'.
 <form id="alias" method="post" action="admin/user">
   <table class="tinybicol" cellpadding="2" cellspacing="0">
     <tr>
-      <th class="alias" colspan="2">
+      <th class="alias" colspan="3">
         Alias e-mail
       </th>
     </tr>
@@ -260,6 +260,8 @@ Pour ceci changer ses permissions en 'disabled'.
     <tr class="{cycle values="impair,pair"}">
       <td>
         <input type="radio" name='best' {if $a.best}checked="checked"{/if} value='{$a.alias}' onclick="this.form.submit()" />
+      </td>
+      <td>
         {if $a.for_life}<strong>{$a.alias}</strong>{else}{$a.alias}{/if}
         {if $a.expire}<span class='erreur'>(expire le {$a.expire|date_format})</span>{/if}
       </td>
@@ -272,8 +274,15 @@ Pour ceci changer ses permissions en 'disabled'.
       {/if}
     </tr>
     {/iterate}
+    {if $virtual}
+    <tr class="{cycle values="impair,pair"}">
+      <td></td>
+      <td>{$virtual}</td>
+      <td></td>
+    </tr>
+    {/if}
     <tr class="{cycle values="impair,pair"}">
-      <td class="detail">
+      <td colspan="2" class="detail">
         <input type="text" name="email" size="29" maxlength="60" value="" />
       </td>
       <td class="action">