From a94fdc4e017ffe257fd8188a3c45d3d4fef64674 Mon Sep 17 00:00:00 2001 From: =?utf8?q?St=C3=A9phane=20Jacob?= Date: Mon, 28 Feb 2011 14:58:01 +0100 Subject: [PATCH] Fixes display of member aliases in Xnet. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Jacob --- classes/user.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/classes/user.php b/classes/user.php index 0407fd3..e4ab7fe 100644 --- a/classes/user.php +++ b/classes/user.php @@ -376,13 +376,16 @@ class User extends PlUser WHERE v.redirect = CONCAT(s.email, \'@\', ds.name) AND v.type = \'user\'', $this->id()); } else { - return XDB::fetchAllAssoc('SELECT CONCAT(v.email, \'@\', dv.name) AS alias, v.uid IS NOT NULL AS sub + return XDB::fetchAllAssoc('alias', + 'SELECT CONCAT(v.email, \'@\', dv.name) AS alias, MAX(v.redirect = CONCAT(s.email, \'@\', ds.name)) AS sub FROM email_virtual AS v INNER JOIN email_virtual_domains AS dv ON (v.domain = dv.id AND dv.name = {?}) INNER JOIN email_source_account AS s ON (s.uid = {?}) INNER JOIN email_virtual_domains AS ms ON (s.domain = ms.id) INNER JOIN email_virtual_domains AS ds ON (ds.aliasing = ms.id) - WHERE v.redirect = CONCAT(s.email, \'@\', ds.name) AND v.type = \'user\'', + WHERE v.type = \'user\' + GROUP BY v.email + ORDER BY v.email', $domain, $this->id()); } } -- 2.1.4