projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixes users merge.
[platal.git]
/
bin
/
cron
/
google_apps.php
diff --git
a/bin/cron/google_apps.php
b/bin/cron/google_apps.php
index
9b6f78d
..
c23f7d1
100755
(executable)
--- 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
$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(
WHERE g.l_userid IS NOT NULL AND s.email IS NULL");
while ($nickname = $res->next()) {
XDB::execute(