X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=plugins%2Finsert.getUserName.php;h=b1846a34fb0eb5fbca8461b20bec51b9b84d8d0f;hb=726eaf7a78b0305f5acd1a6e2ac256f30d97d7b1;hp=70a70f72accd6c8704e83b4c40ea7315feddd48b;hpb=a415be4f1460f3702f9c07667caae34b7489d429;p=platal.git diff --git a/plugins/insert.getUserName.php b/plugins/insert.getUserName.php index 70a70f7..b1846a3 100644 --- a/plugins/insert.getUserName.php +++ b/plugins/insert.getUserName.php @@ -1,6 +1,6 @@ fetchOneCell(); + $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, "@")); + $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;