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

diff --git a/plugins/insert.getUserName.php b/plugins/insert.getUserName.php
index ca14209..bd7af29 100644
--- a/plugins/insert.getUserName.php
+++ b/plugins/insert.getUserName.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2007 Polytechnique.org                              *
+ *  Copyright (C) 2003-2009 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -23,14 +23,14 @@ function smarty_insert_getUsername()
 {
     global $globals;
 
-    $id = Cookie::i('ORGuid', -1);
+    $id = Cookie::i('uid', -1);
     $id = S::v($_SESSION['uid'], $id);
 
     if ($id<0) {
         return "";
     }
 
-    if (Cookie::v('ORGdomain', 'login') != 'alias') {
+    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();
@@ -40,7 +40,7 @@ function smarty_insert_getUsername()
 	          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, {?}) 
+                 WHERE redirect = CONCAT(a.alias, {?})
 		       OR redirect = CONCAT(a.alias, {?})",
 		$id, "@".$globals->mail->domain, "@".$globals->mail->domain2);
 	$alias = $res->fetchOneCell();