Only geocodes addresses that were already geocoded.

[platal.git] / plugins / insert.getUserName.php

diff --git a/plugins/insert.getUserName.php b/plugins/insert.getUserName.php
index bd7af29..494e78e 100644 (file)
--- 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   *
@@ -24,30 +24,36 @@ 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();
+        $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(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, "@"));
+        $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 $login;
+     return '';
 }
 
 // vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: