aliases.id => aliases.uid

[platal.git] / bin / cron / google_apps.php

diff --git a/bin/cron/google_apps.php b/bin/cron/google_apps.php
index 925cb33..60b8311 100755 (executable)
--- a/bin/cron/google_apps.php
+++ b/bin/cron/google_apps.php
@@ -1,7 +1,7 @@
 #!/usr/bin/php5 -q
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2008 Polytechnique.org                              *
+ *  Copyright (C) 2003-2010 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -35,7 +35,7 @@ $res = XDB::iterator(
     "SELECT  g.g_account_name, a.id
        FROM  gapps_accounts AS g
   LEFT JOIN  aliases as a ON (a.alias = g.g_account_name AND a.type = 'a_vie')
-      WHERE  (g.l_userid IS NULL OR g.l_userid <= 0) AND a.id IS NOT NULL");
+      WHERE  (g.l_userid IS NULL OR g.l_userid <= 0) AND a.uid IS NOT NULL");
 while ($account = $res->next()) {
     XDB::execute(
         "UPDATE  gapps_accounts
@@ -49,7 +49,7 @@ $res = XDB::iterator(
     "SELECT  g.g_account_name
        FROM  gapps_accounts AS g
   LEFT JOIN  aliases as a ON (a.alias = g.g_account_name AND a.type = 'a_vie')
-      WHERE  (g.l_userid IS NULL OR g.l_userid <= 0) AND a.id IS NULL");
+      WHERE  (g.l_userid IS NULL OR g.l_userid <= 0) AND a.uid IS NULL");
 while ($account = $res->next()) {
     if (!preg_match("/^admin-/", $account['g_account_name'])) {
         printf("Warning: GApps account '%s' has no local user_id.\n", $account['g_account_name']);
@@ -61,7 +61,7 @@ $res = XDB::iterator(
     "SELECT  g.g_account_name, a.id
        FROM  gapps_nicknames AS g
   LEFT JOIN  aliases AS a ON (a.alias = g.g_account_name AND a.type = 'a_vie')
-      WHERE  (g.l_userid IS NULL or g.l_userid <= 0) AND a.id IS NOT NULL
+      WHERE  (g.l_userid IS NULL or g.l_userid <= 0) AND a.uid IS NOT NULL
    GROUP BY  g_account_name");
 while ($nickname = $res->next()) {
     XDB::execute(
@@ -76,7 +76,7 @@ $res = XDB::iterator(
     "SELECT  g.g_account_name
        FROM  gapps_nicknames AS g
   LEFT JOIN  aliases as a ON (a.alias = g.g_account_name AND a.type = 'a_vie')
-      WHERE  (g.l_userid IS NULL OR g.l_userid <= 0) AND a.id IS NULL");
+      WHERE  (g.l_userid IS NULL OR g.l_userid <= 0) AND a.uid IS NULL");
 while ($nickname = $res->next()) {
     if (!preg_match("/^admin-/", $nickname['g_account_name'])) {
         printf("Warning: Nickname '%s' has no local user_id.\n", $nickname['g_account_name']);
@@ -88,10 +88,10 @@ while ($nickname = $res->next()) {
 $res = XDB::iterator(
     "SELECT  g.l_userid AS id, f.alias AS username, a.alias AS nickname
        FROM  gapps_accounts AS g
- INNER JOIN  aliases AS f ON (f.id = g.l_userid AND f.type = 'a_vie')
- INNER JOIN  aliases AS a ON (a.id = g.l_userid AND a.type = 'alias')
+ INNER JOIN  aliases AS f ON (f.uid = g.l_userid AND f.type = 'a_vie')
+ INNER JOIN  aliases AS a ON (a.uid = g.l_userid AND a.type = 'alias')
   LEFT JOIN  gapps_nicknames AS n ON (n.l_userid = g.l_userid AND n.g_nickname = a.alias)
-      WHERE  n.g_nickname IS NULL AND g.l_userid IS NOT NULL");
+      WHERE  g.g_status = 'active' AND n.g_nickname IS NULL AND g.l_userid IS NOT NULL");
 while ($nickname = $res->next()) {
     // Checks that the requested nickname doesn't look like a regular forlife;
     // we might run in troubler later if we don't keep the two repos. If we need
@@ -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  aliases AS a ON (a.id = g.l_userid AND a.type = 'alias' AND a.alias = g.g_nickname)
+  LEFT JOIN  aliases AS a ON (a.uid = g.l_userid AND a.type = 'alias' AND a.alias = g.g_nickname)
       WHERE  g.l_userid IS NOT NULL AND a.alias IS NULL");
 while ($nickname = $res->next()) {
     XDB::execute(