From 148bf0114358ed074f067480efd6aad1eb31d6f4 Mon Sep 17 00:00:00 2001 From: Florent Bruneau Date: Wed, 4 Jun 2008 22:56:22 +0200 Subject: [PATCH] Fix alias subscription when changing user status. Signed-off-by: Florent Bruneau --- modules/xnetgrp.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/modules/xnetgrp.php b/modules/xnetgrp.php index a64e2a1..712b090 100644 --- a/modules/xnetgrp.php +++ b/modules/xnetgrp.php @@ -898,13 +898,13 @@ class XnetGrpModule extends PLModule // Update subscription to aliases if ($email != $user['email']) { XDB::execute("UPDATE IGNORE virtual_redirect AS vr - INNER JOIN virtual AS v ON(vr.vid = v.vid AND SUBSTRING_INDEX(alias, '@', 2) = {?}) + INNER JOIN virtual AS v ON(vr.vid = v.vid AND SUBSTRING_INDEX(alias, '@', -1) = {?}) SET vr.redirect = {?} WHERE vr.redirect = {?}", $globals->asso('mail_domain'), $email, $user['email']); XDB::execute("DELETE vr.* FROM virtual_redirect AS vr - INNER JOIN virtual AS v ON(vr.vid = v.vid AND SUBSTRING_INDEX(alias, '@', 2) = {?}) + INNER JOIN virtual AS v ON(vr.vid = v.vid AND SUBSTRING_INDEX(alias, '@', -1) = {?}) WHERE vr.redirect = {?}", $globals->asso('mail_domain'), $user['email']); foreach (Env::v('ml1', array()) as $ml => $state) { @@ -1016,15 +1016,16 @@ class XnetGrpModule extends PLModule } $page->assign('user', $user); + echo $user['email2']; $listes = $mmlist->get_lists($user['email2']); $page->assign('listes', $listes); $res = XDB::query( 'SELECT alias, redirect IS NOT NULL as sub FROM virtual AS v - LEFT JOIN virtual_redirect AS vr ON(v.vid=vr.vid AND redirect={?}) + LEFT JOIN virtual_redirect AS vr ON(v.vid=vr.vid AND (redirect = {?} OR redirect = {?})) WHERE alias LIKE {?} AND type="user"', - $user['email'], '%@'.$globals->asso('mail_domain')); + $user['email'], $user['email2'], '%@'.$globals->asso('mail_domain')); $page->assign('alias', $res->fetchAllAssoc()); } -- 2.1.4