X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=plugins%2Finsert.getUserName.php;h=f054e5d7701a6fc17d2cef54212d257cd09fe56b;hb=f32fe5676824eee016d40779785895d0b84edca5;hp=b1846a34fb0eb5fbca8461b20bec51b9b84d8d0f;hpb=fb813fb52d5ab65ca9a5b92b5cb9089523380d79;p=platal.git

diff --git a/plugins/insert.getUserName.php b/plugins/insert.getUserName.php
index b1846a3..f054e5d 100644
--- a/plugins/insert.getUserName.php
+++ b/plugins/insert.getUserName.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2010 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,15 @@
 
 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();
-    } 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 $login;
+    $user = User::getSilentWithUID($id);
+    return $user->bestEmail();
 }
 
 // vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: