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

diff --git a/plugins/insert.getUserName.php b/plugins/insert.getUserName.php
index 769853b..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,39 +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 (Cookie::v('domain', 'login') != 'alias') {
-        $res = XDB::query("SELECT  alias
-                             FROM  aliases
-                            WHERE  uid = {?} 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 (uid = {?} AND a.type = 'a_vie')
-             WHERE  redirect = CONCAT(a.alias, {?}) OR redirect = CONCAT(a.alias, {?})",
-            $id, '@' . $globals->mail->domain, '@' . $globals->mail->domain2);
-        $aliases = $res->fetchAllAssoc();
-        foreach ($aliases as $alias) {
-            list($login, $domain) = explode('@', $alias['alias']);
-            if ($domain == $globals->mail->alias_dom || $domain == $globals->mail->alias_dom2) {
-                return $login;
-            }
-        }
-     }
-
-     return '';
+    $user = User::getSilentWithUID($id);
+    return $user->bestEmail();
 }
 
 // vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: