X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=plugins%2Finsert.getUserName.php;h=e8172fe84be1864e31169f0c6bd74f2a1d44765b;hb=04d12e249de32cb30d8e8846a2974d47fd4025b5;hp=bd7af29768404b4b66766f0b1e44a627368e72bb;hpb=ecf2b474289f94932ff60ab18674610979d0e0db;p=platal.git

diff --git a/plugins/insert.getUserName.php b/plugins/insert.getUserName.php
index bd7af29..e8172fe 100644
--- a/plugins/insert.getUserName.php
+++ b/plugins/insert.getUserName.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2009 Polytechnique.org                              *
+ *  Copyright (C) 2003-2011 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -21,33 +21,26 @@
 
 function smarty_insert_getUsername()
 {
-    global $globals;
-
     $id = Cookie::i('uid', -1);
-    $id = S::v($_SESSION['uid'], $id);
+    $id = S::v('uid', $id);
 
-    if ($id<0) {
-        return "";
+    if ($id < 0) {
+        return '';
     }
 
     if (Cookie::v('domain', 'login') != 'alias') {
-	$res = XDB::query("SELECT  alias FROM aliases
-	                              WHERE  id={?} AND (type IN ('a_vie','alias') AND FIND_IN_SET('bestalias', flags))", $id);
-	return $res->fetchOneCell();
+        return XDB::fetchOneCell('SELECT  email
+                                    FROM  email_source_account
+                                   WHERE  uid = {?} AND type != \'alias_aux\' AND FIND_IN_SET(\'bestalias\', flags)',
+                                 $id);
     } else {
-	$res = XDB::query("
-		SELECT v.alias
-	          FROM virtual AS v
-	    INNER JOIN virtual_redirect USING(vid)
-	    INNER JOIN aliases AS a ON(id={?} AND a.type='a_vie')
-                 WHERE redirect = CONCAT(a.alias, {?})
-		       OR redirect = CONCAT(a.alias, {?})",
-		$id, "@".$globals->mail->domain, "@".$globals->mail->domain2);
-	$alias = $res->fetchOneCell();
-	return substr($alias, 0, strpos($alias, "@"));
-     }
+        return XDB::fetchOneCell('SELECT  email
+                                    FROM  email_source_account
+                                   WHERE  uid = {?} AND type = \'alias_aux\'',
+                                 $id);
+    }
 
-     return $login;
+     return '';
 }
 
 // vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: