melix fixed

diff --git a/htdocs/alias.php b/htdocs/alias.php
index 16a1d9e..7150794 100644 (file)
--- a/htdocs/alias.php
+++ b/htdocs/alias.php
@@ -18,7 +18,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: alias.php,v 1.5 2004-08-31 10:03:28 x2000habouzit Exp $
+        $Id: alias.php,v 1.6 2004-09-02 20:11:22 x2000habouzit Exp $
  ***************************************************************************/
 
 require("auto.prepend.inc.php");
@@ -29,7 +29,7 @@ new_skinned_page('alias.tpl', AUTH_MDP);
 $page->assign('demande', AliasReq::get_unique_request($_SESSION['uid']));
 
 //Récupération des alias éventuellement existants
-$sql = "SELECT domain from groupex.aliases WHERE id=12 AND email like '".$_SESSION['username']."'";
+$sql = "SELECT domain from groupex.aliases WHERE id=12 AND email='{$_SESSION['forlife']}'";
 if($result = $globals->db->query($sql)) {
     list($aliases) = mysql_fetch_row($result);
     mysql_free_result($result);

diff --git a/include/valid_aliases.inc.php b/include/valid_aliases.inc.php
index 44b6a38..2849527 100644 (file)
--- a/include/valid_aliases.inc.php
+++ b/include/valid_aliases.inc.php
@@ -18,14 +18,14 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: valid_aliases.inc.php,v 1.14 2004-08-31 22:01:31 x2000habouzit Exp $
+        $Id: valid_aliases.inc.php,v 1.15 2004-09-02 20:11:23 x2000habouzit Exp $
  ***************************************************************************/
 
 class AliasReq extends Validate {
     var $alias;
     var $raison;
 
-    var $username;
+    var $forlife;
     var $prenom;
     var $nom;
     var $old;
@@ -36,10 +36,13 @@ class AliasReq extends Validate {
         $this->alias = $_alias;
         $this->raison = $_raison;
         
-        $sql = $globals->db->query("SELECT username,prenom,nom,domain FROM auth_user_md5 as u "
-                        .  "LEFT JOIN groupex.aliases as a ON (a.email = u.username and a.id = 12)    "
-                        .  "WHERE user_id='".$this->uid."'");
-        list($this->username,$this->prenom,$this->nom,$this->old) = mysql_fetch_row($sql);
+        $sql = $globals->db->query("
+           SELECT  l.alias,prenom,nom,domain
+             FROM  auth_user_md5 AS u
+       INNER JOIN  aliases       AS l ON(u.user_id=l.id AND type='a_vie')
+         LEFT JOIN  groupex.aliases as a ON (a.email = l.alias and a.id = 12)
+             WHERE  user_id='".$this->uid."'");
+        list($this->forlife,$this->prenom,$this->nom,$this->old) = mysql_fetch_row($sql);
         mysql_free_result($sql);
     }
 
@@ -57,7 +60,7 @@ class AliasReq extends Validate {
         require_once("tpl.mailer.inc.php");
         $mymail = new TplMailer('valid.alias.tpl');
         $mymail->assign('alias', $this->alias);
-        $mymail->assign('username', $this->username);
+        $mymail->assign('forlife', $this->forlife);
 
         if($_REQUEST['submit']=="Accepter") {
             $mymail->assign('answer', 'yes');
@@ -76,8 +79,8 @@ class AliasReq extends Validate {
         global $globals;
 
         $domain=$this->alias.'@melix.net';
-        $globals->db->query("DELETE FROM groupex.aliases WHERE id=12 AND email='{$this->username}'");
-        $globals->db->query("INSERT INTO groupex.aliases SET email='{$this->username}',domain='$domain',id=12");         
+        $globals->db->query("DELETE FROM groupex.aliases WHERE id=12 AND email='{$this->forlife}'");
+        $globals->db->query("INSERT INTO groupex.aliases SET email='{$this->forlife}',domain='$domain',id=12");         
     }
 }
 

diff --git a/templates/alias.tpl b/templates/alias.tpl
index eefb0dc..22713fb 100644 (file)
--- a/templates/alias.tpl
+++ b/templates/alias.tpl
@@ -17,7 +17,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: alias.tpl,v 1.8 2004-08-31 11:25:38 x2000habouzit Exp $
+        $Id: alias.tpl,v 1.9 2004-09-02 20:11:23 x2000habouzit Exp $
  ***************************************************************************}
 
 
@@ -65,9 +65,9 @@
 
   <br />
   <form action="{$smarty.server.PHP_SELF}" method="post">
-    <table class="tinybicol" cellpadding="4" summary="Demande d'alias">
+    <table class="bicol" cellpadding="4" summary="Demande d'alias">
       <tr>
-        <th colspan="2">Demande d'alias</th>
+        <th>Demande d'alias</th>
       </tr>
       <tr>
         <td>Alias demandé :</td>

diff --git a/templates/include/form.valid.aliases.tpl b/templates/include/form.valid.aliases.tpl
index 3faee87..a4d338b 100644 (file)
--- a/templates/include/form.valid.aliases.tpl
+++ b/templates/include/form.valid.aliases.tpl
@@ -17,45 +17,45 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: form.valid.aliases.tpl,v 1.8 2004-08-31 11:25:40 x2000habouzit Exp $
+        $Id: form.valid.aliases.tpl,v 1.9 2004-09-02 20:11:23 x2000habouzit Exp $
  ***************************************************************************}
 
 
 <form action="{$smarty.server.PHP_SELF}" method="post">
-<table class="bicol" cellpadding="4" summary="Demande d'alias">
-<tr>
-  <td>Demandeur&nbsp;:
-  </td>
-  <td>
-    <a href="javascript:x()" onclick="popWin('{"fiche.php"|url}?user={$valid->username}')">
-    {$valid->prenom} {$valid->nom}</a> {$valid->old}
-  </td>
-</tr>
-<tr>
-  <td>Nouvel&nbsp;alias&nbsp;:</td>
-  <td>{$valid->alias}@melix.net</td>
-</tr>
-<tr>
-  <td>Motif :</td>
-  <td style="border: 1px dotted inherit">
-    {$this->raison|nl2br}
-  </td>
-</tr>
-<tr>
-  <td class="middle">
-    <input type="hidden" name="uid" value="{$valid->uid}" />
-    <input type="hidden" name="type" value="{$valid->type}" />
-    <input type="hidden" name="stamp" value="{$valid->stamp}" />
-    <input type="submit" name="submit" value="Accepter" />
-    <br /><br />
-    <input type="submit" name="submit" value="Refuser" />
-  </td>
-  <td>
-    <p>Raison du refus:</p>
-    <textarea rows="5" cols="74" name="motif"></textarea>
-  </td>
-</tr>
-</table>
+  <table class="bicol" cellpadding="4" summary="Demande d'alias">
+    <tr>
+      <td>Demandeur&nbsp;:
+      </td>
+      <td>
+        <a href="javascript:x()" onclick="popWin('{"fiche.php"|url}?user={$valid->forlife}')">
+          {$valid->prenom} {$valid->nom}</a> {$valid->old}
+      </td>
+    </tr>
+    <tr>
+      <td>Nouvel&nbsp;alias&nbsp;:</td>
+      <td>{$valid->alias}@melix.net</td>
+    </tr>
+    <tr>
+      <td>Motif :</td>
+      <td style="border: 1px dotted inherit">
+        {$valid->raison|nl2br}
+      </td>
+    </tr>
+    <tr>
+      <td class="middle">
+        <input type="hidden" name="uid" value="{$valid->uid}" />
+        <input type="hidden" name="type" value="{$valid->type}" />
+        <input type="hidden" name="stamp" value="{$valid->stamp}" />
+        <input type="submit" name="submit" value="Accepter" />
+        <br /><br />
+        <input type="submit" name="submit" value="Refuser" />
+      </td>
+      <td>
+        <p>Raison du refus:</p>
+        <textarea rows="5" cols="50" name="motif"></textarea>
+      </td>
+    </tr>
+  </table>
 </form>
 
 {* vim:set et sw=2 sts=2 sws=2: *}