From 3a5c15515ef4b984e33ada46ba34ac77e6156672 Mon Sep 17 00:00:00 2001
From: x2003bruneau <x2003bruneau@839d8a87-29fc-0310-9880-83ba4fa771e5>
Date: Wed, 15 Nov 2006 16:16:13 +0000
Subject: [PATCH] Close #548: prenom.nom.promo is a valid login for password
 recovery

git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@1089 839d8a87-29fc-0310-9880-83ba4fa771e5
---
 ChangeLog              | 1 +
 modules/platal.php     | 5 +++--
 templates/recovery.tpl | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 776aca6..41f6f22 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -34,6 +34,7 @@ Bug/Wish:
     * Core:
         - #473: Use 'événement' instead of 'évènement'.                    -FRU
         - #475: More understandable bug report form.                       -FRU
+        - #548: More informations for recovery for homonyms                -FRU
 
     * Events:
         - #517: URL catcher update (www).                                  -Car
diff --git a/modules/platal.php b/modules/platal.php
index 887c133..176bc2f 100644
--- a/modules/platal.php
+++ b/modules/platal.php
@@ -256,7 +256,7 @@ class PlatalModule extends PLModule
         $res = XDB::query(
                 "SELECT  user_id, naissance
                    FROM  auth_user_md5 AS u
-             INNER JOIN  aliases       AS a ON (u.user_id=a.id AND type!='homonyme')
+             INNER JOIN  aliases       AS a ON (u.user_id=a.id AND type != 'homonyme')
                   WHERE  a.alias={?} AND u.perms IN ('admin','user') AND u.deces=0", $mailorg);
         list($uid, $naissance) = $res->fetchOneRow();
 
@@ -292,7 +292,8 @@ Mail envoy
             $logger = $_SESSION['log'] = new CoreLogger($uid);
             $logger->log('recovery', $emails);
         } else {
-            $page->trig('Pas de résultat correspondant aux champs entrés dans notre base de données.');
+            $page->trig('Les informations que tu as rentrées ne permettent pas de récupérer ton mot de passe.<br />'.
+                        'Si tu as un homonyme, utilise prenom.nom.promo comme login');
         }
     }
 
diff --git a/templates/recovery.tpl b/templates/recovery.tpl
index 19ef7e9..ee94646 100644
--- a/templates/recovery.tpl
+++ b/templates/recovery.tpl
@@ -63,7 +63,7 @@ certificat sur cette page.
     <tr>
       <td class="titre">
         Login :<br />
-        <span class="smaller">"prenom.nom"</span>
+        <span class="smaller">"prenom.nom" ou "prenom.nom.promo"</span>
       </td>
       <td>
         <input type="text" size="20" maxlength="50" name="login" />
-- 
2.1.4