backport

diff --git a/htdocs/epouse.php b/htdocs/epouse.php
index 821919f..7c31709 100644 (file)
--- a/htdocs/epouse.php
+++ b/htdocs/epouse.php
@@ -18,21 +18,27 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: epouse.php,v 1.8 2004-09-03 00:15:46 x2000bedo Exp $
+        $Id: epouse.php,v 1.9 2004-10-19 22:05:09 x2000habouzit Exp $
  ***************************************************************************/
 
 require("auto.prepend.inc.php");
 require("validations.inc.php");
+require("xorg.misc.inc.php");
 
 new_skinned_page('epouse.tpl', AUTH_MDP);
 
-$res = $globals->db->query("select u.nom,u.epouse,i.flags from auth_user_md5 as u
-                    left join identification as i using(matricule)
-                    where user_id=".$_SESSION['uid']);
+$res = $globals->db->query(
+    "SELECT  u.nom,u.epouse,i.flags,e.alias
+       FROM  auth_user_md5  AS u
+  LEFT JOIN  identification AS i USING(matricule)
+  LEFT JOIN  aliases        AS e ON(u.user_id = e.id)
+      WHERE  user_id=".$_SESSION['uid']);
 
-list($nom,$epouse_old,$flags) = mysql_fetch_row($res);
+list($nom,$epouse_old,$flags,$alias_old) = mysql_fetch_row($res);
 $flags=new flagset($flags);
 $page->assign('is_femme',$flags->hasflag("femme"));
+$page->assign('epouse_old',$epouse_old);
+$page->assign('alias_old',$alias_old);
 
 $epouse = replace_accent(trim(clean_request('epouse'))); 
 $epouse = strtoupper($epouse);
@@ -45,12 +51,7 @@ if (!empty($_REQUEST['submit']) && ($epouse != $epouse_old)) {
     } else { // le nom de mariage est distinct du nom à l'X
         // on calcule l'alias pour l'afficher
         $myepouse = new EpouseReq($_SESSION['uid'], $_SESSION['forlife'], $epouse);
-        list($prenom_forlife,$nom_forlife,$promo) = explode('.',$_SESSION['forlife']);
-        $alias_old=make_forlife($prenom_forlife,$epouse_old,$promo);
         $myepouse->submit();
-
-        $page->assign('epouse_old',$epouse_old);
-        $page->assign('alias_old',$alias_old);
         $page->assign('myepouse',$myepouse);
     }
 }

diff --git a/include/valid_epouses.inc.php b/include/valid_epouses.inc.php
index 7fe1fc5..e567dd9 100644 (file)
--- 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.16 2004-09-02 21:09:32 x2000habouzit Exp $
+        $Id: valid_epouses.inc.php,v 1.17 2004-10-19 22:05:09 x2000habouzit Exp $
  ***************************************************************************/
 
 
@@ -41,13 +41,14 @@ class EpouseReq extends Validate {
         $this->forlife = $_forlife;
         
         list($prenom) = explode('.',$_forlife);
-        $this->alias = make_forlife($prenom,$this->epouse);
+        $this->alias = make_username($prenom,$this->epouse);
         if(empty($_epouse)) $this->alias = "";
         
         $sql = $globals->db->query("
-           SELECT  u.alias, u.epouse, u.prenom, u.nom, a.id
+           SELECT  e.alias, u.epouse, u.prenom, u.nom, a.id
              FROM  auth_user_md5 as u
-        LEFT JOIN  aliases       as a ON(a.alias = '{$this->alias}' and a.id != u.user_id)
+        LEFT JOIN  aliases       as e ON(e.type='epouse' AND e.id = u.user_id)
+        LEFT JOIN  aliases       as a ON(a.alias = '{$this->alias}' AND a.id != u.user_id)
             WHERE  u.user_id = ".$this->uid);
         list($this->oldalias, $this->oldepouse, $this->prenom, $this->nom, $this->homonyme) = mysql_fetch_row($sql);
         mysql_free_result($sql);
@@ -89,7 +90,7 @@ class EpouseReq extends Validate {
     function commit () {
         global $globals;
         
-        $globals->db->query("UPDATE auth_user_md5 set epouse='".$this->epouse."',alias='".$this->alias."' WHERE user_id=".$this->uid);
+        $globals->db->query("UPDATE auth_user_md5 set epouse='".$this->epouse."' 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.")");
         $f = fopen("/tmp/flag_recherche","w");

diff --git a/templates/include/form.valid.epouses.tpl b/templates/include/form.valid.epouses.tpl
index bd044a8..1b8f295 100644 (file)
--- 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.8 2004-09-02 21:09:32 x2000habouzit Exp $
+        $Id: form.valid.epouses.tpl,v 1.9 2004-10-19 22:05:09 x2000habouzit Exp $
  ***************************************************************************}
 
 
@@ -38,7 +38,7 @@
     </tr>
     <tr>
       <td>Nouvel&nbsp;alias&nbsp;:</td>
-      <td>{$valid->alias|default:"<span class='erreur'>suppression</span>}</td>
+      <td>{$valid->alias|default:"<span class='erreur'>suppression</span>"}</td>
     </tr>
     {if $valid->homonyme}
     <tr>