From 1f0d490c551ab1ca021f4ea8af8c2d645e07969e Mon Sep 17 00:00:00 2001 From: Vincent Zanotti Date: Sat, 26 Mar 2011 19:22:58 +0100 Subject: [PATCH] Fixes the alias synchronization query in the gapps cronjob. It was accidentally trying to synchronize forlifes as aliases, which causes all previous aliases to be dropped from gapps. Signed-off-by: Vincent Zanotti --- bin/cron/google_apps.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/cron/google_apps.php b/bin/cron/google_apps.php index 9b6f78d..c23f7d1 100755 --- a/bin/cron/google_apps.php +++ b/bin/cron/google_apps.php @@ -111,7 +111,7 @@ while ($nickname = $res->next()) { $res = XDB::iterator( "SELECT g.l_userid AS id, g.g_nickname AS nickname FROM gapps_nicknames AS g - LEFT JOIN email_source_account AS s ON (s.uid = g.l_userid AND s.type = 'forlife' AND s.email = g.g_nickname) + LEFT JOIN email_source_account AS s ON (s.uid = g.l_userid AND s.type = 'alias' AND s.email = g.g_nickname) WHERE g.l_userid IS NOT NULL AND s.email IS NULL"); while ($nickname = $res->next()) { XDB::execute( -- 2.1.4