From: x2000habouzit <x2000habouzit>
Date: Wed, 1 Sep 2004 22:51:00 +0000 (+0000)
Subject: epouses
X-Git-Tag: xorg/old~1620
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=c3bbd7551b9aa9a6d1396f5c2d68c99307034a94;p=platal.git

epouses
---

diff --git a/include/valid_epouses.inc.php b/include/valid_epouses.inc.php
index bce119d..92b7d58 100644
--- a/include/valid_epouses.inc.php
+++ b/include/valid_epouses.inc.php
@@ -18,7 +18,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: valid_epouses.inc.php,v 1.14 2004-09-01 21:33:08 x2000habouzit Exp $
+        $Id: valid_epouses.inc.php,v 1.15 2004-09-01 22:51:00 x2000habouzit Exp $
  ***************************************************************************/
 
 
@@ -42,8 +42,7 @@ class EpouseReq extends Validate {
         
         list($prenom) = explode('.',$_username);
         $this->alias = make_username($prenom,$this->epouse);
-        if(empty($_epouse))
-            $this->alias = "<span class=\"erreur\">suppression</a>";
+        if(empty($_epouse)) $this->alias = "";
         
         $sql = $globals->db->query("select u1.alias, u1.epouse, u1.prenom, u1.nom"
             .", IFNULL(u2.username,u3.username)"
@@ -93,7 +92,6 @@ class EpouseReq extends Validate {
     function commit () {
         global $globals;
         
-        $alias = ($this->epouse ? $this->alias : "");
         $globals->db->query("UPDATE auth_user_md5 set epouse='".$this->epouse."',alias='".$this->alias."' WHERE user_id=".$this->uid);
 	$globals->db->query("DELETE FROM aliases WHERE type='epouse' AND id=".$this->uid);
 	$globals->db->query("INSERT INTO aliases VALUES('".$this->alias."', 'epouse', ".$this->uid.")");
diff --git a/templates/include/form.valid.epouses.tpl b/templates/include/form.valid.epouses.tpl
index 58a06af..aaecd02 100644
--- a/templates/include/form.valid.epouses.tpl
+++ b/templates/include/form.valid.epouses.tpl
@@ -17,7 +17,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: form.valid.epouses.tpl,v 1.6 2004-08-31 11:25:40 x2000habouzit Exp $
+        $Id: form.valid.epouses.tpl,v 1.7 2004-09-01 22:51:00 x2000habouzit Exp $
  ***************************************************************************}
 
 
@@ -38,7 +38,7 @@
     </tr>
     <tr>
       <td>Nouvel&nbsp;alias&nbsp;:</td>
-      <td>{$valid->alias}</td>
+      <td>{$valid->alias|default:"<span class='erreur'>suppression</span>}</td>
     </tr>
     {if $valid->homonyme}
     <tr>