From 51e8d3c3348c33a65e3e55ae109b9d7d0cf80ad6 Mon Sep 17 00:00:00 2001
From: x2000habouzit <x2000habouzit>
Date: Thu, 2 Sep 2004 18:37:14 +0000
Subject: [PATCH] username fix

---
 htdocs/exit.php           |  9 ++++-----
 include/xorg.misc.inc.php | 24 ++++--------------------
 2 files changed, 8 insertions(+), 25 deletions(-)

diff --git a/htdocs/exit.php b/htdocs/exit.php
index 076aef6..7838d6d 100644
--- a/htdocs/exit.php
+++ b/htdocs/exit.php
@@ -18,19 +18,19 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: exit.php,v 1.4 2004-08-31 10:03:28 x2000habouzit Exp $
+        $Id: exit.php,v 1.5 2004-09-02 18:37:14 x2000habouzit Exp $
  ***************************************************************************/
 
 require("auto.prepend.inc.php");
 new_skinned_page('index.tpl',AUTH_MDP);
 
 if (isset($_SESSION['suid'])) {
-    $res = @$globals->db->query( "SELECT username,prenom,nom,promo,perms FROM auth_user_md5 WHERE user_id='{$_SESSION['suid']}'");
+    $res = @$globals->db->query( "SELECT prenom,nom,promo,perms FROM auth_user_md5 WHERE user_id='{$_SESSION['suid']}'");
     if(@mysql_num_rows($res) != 0) {
-        list($username,$prenom,$nom,$promo,$perms)=mysql_fetch_row($res);
+        list($prenom,$nom,$promo,$perms)=mysql_fetch_row($res);
         // on rétablit les loggers
         // on loggue la fermeture de la session de su
-        $log_data = $_SESSION['username']." by ".$username;
+        $log_data = "{$_SESSION['prenom']} {$_SESSION['nom']} {$_SESSION['promo']} by $prenom $nom $promo";
         $_SESSION['log']->log("suid_stop",$log_data);
         $_SESSION['log'] = $_SESSION['slog'];
         unset($_SESSION['slog']);
@@ -41,7 +41,6 @@ if (isset($_SESSION['suid'])) {
         $_SESSION['prenom'] = $prenom;
         $_SESSION['nom'] = $nom;
         $_SESSION['promo'] = $promo;
-        $_SESSION['username'] = $username;
         $_SESSION['perms'] = $perms;
     }
 }
diff --git a/include/xorg.misc.inc.php b/include/xorg.misc.inc.php
index c8bb287..1e71221 100644
--- a/include/xorg.misc.inc.php
+++ b/include/xorg.misc.inc.php
@@ -18,33 +18,17 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: xorg.misc.inc.php,v 1.4 2004-08-31 11:16:48 x2000habouzit Exp $
+        $Id: xorg.misc.inc.php,v 1.5 2004-09-02 18:37:15 x2000habouzit Exp $
  ***************************************************************************/
 
-/** vérifie si une adresse email (sans @) correspond à un username ou alias ou une liste...
+/** vérifie si une adresse email (sans @) correspond à un alias (FIXME ou une liste)...
  * @param $email l'adresse email a verifier
  * @return BOOL
  */
 function isvalid_email_local($email) {
   global $globals;
-  // ATTENTION, les requêtes sur le username et l'alias ne doivent pas être faites
-  // dans la même requête MySQL, car elles portent sur 2 index de la table avec un OR
-  // et MySQL ne sait pas utiliser les index dans ce cas
-  // (ce n'est plus vrai dans MySQL 4.x donc quand on y passera, on pourra
-  // combiner les 2 requêtes suivantes en une seule)
-  $req = $globals->db->query("select count(*) from auth_user_md5 where username='$email'");
-  list($nb)=mysql_fetch_row($req);
-  mysql_free_result($req);
-  if ($nb>0) return true;
-
-  $req = $globals->db->query("select count(*) from auth_user_md5 where alias='$email'");
-  list($nb)=mysql_fetch_row($req);
-  mysql_free_result($req);
-  if ($nb>0) return true;
-
-  // vérification des adresses types $liste et $liste-request
-  // ATTENTION, il ne faut pas accepter les adresses types owner-$liste et sm-$liste
-  $req = $globals->db->query("select count(*) from aliases where (alias='$email' and type='liste') or (alias='$email-request' and type='liste-request')");
+  
+  $req = $globals->db->query("select count(*) from aliases where alias='$email'");
   list($nb)=mysql_fetch_row($req);
   mysql_free_result($req);
   if ($nb>0) return true;
-- 
2.1.4