backport (epouses)

Patches applied:

 * opensource@polytechnique.org--2005/platal--release--0.9.4--patch-42
   epouse bug

git-archimport-id: opensource@polytechnique.org--2005/platal--mainline--0.9--patch-509

diff --git a/htdocs/epouse.php b/htdocs/epouse.php
index 99987f6..28176c3 100644 (file)
--- a/htdocs/epouse.php
+++ b/htdocs/epouse.php
@@ -37,7 +37,7 @@ $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 = replace_accent(trim(Env::get('epouse'))); 
 $epouse = strtoupper($epouse);
 $page->assign('epouse_req', $epouse);
 
@@ -47,7 +47,7 @@ if (Env::has('submit') && ($epouse != $epouse_old)) {
         $page->assign('same', true);
     } else { // le nom de mariage est distinct du nom à l'X
         // on calcule l'alias pour l'afficher
-        $myepouse = new EpouseReq(Env::getInt('uid'), Env::get('forlife'), $epouse);
+        $myepouse = new EpouseReq(Session::getInt('uid'), $epouse);
         $myepouse->submit();
         $page->assign('myepouse', $myepouse);
     }

diff --git a/include/validations/epouses.inc.php b/include/validations/epouses.inc.php
index 35a4841..25ead2e 100644 (file)
--- a/include/validations/epouses.inc.php
+++ b/include/validations/epouses.inc.php
@@ -38,14 +38,13 @@ class EpouseReq extends Validate
     // }}}
     // {{{ constructor
 
-    function EpouseReq($_uid, $_forlife, $_epouse, $_stamp=0)
+    function EpouseReq($_uid, $_epouse)
     {
         global $globals;
-        $this->Validate($_uid, true, 'epouse', $_stamp);
+        $this->Validate($_uid, true, 'epouse');
         $this->epouse  = $_epouse;
-        $this->forlife = $_forlife;
-        list($prenom)  = explode('.',$_forlife);
-        $this->alias   = make_username($prenom, $this->epouse);
+        $this->alias   = make_username($this->prenom, $this->epouse);
+        var_export($this);
 
         $res = $globals->xdb->query("
                 SELECT  e.alias, u.epouse, a.id