X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=bin%2Fcron%2Femails.check.php;h=e38dfb8173bc8a8ad61ff02c3486991433b919ca;hb=5ecaa68e834e823f3d2ab9ea2c3613c1ebc19bf6;hp=b237e524fdf39fd3ce339ad1bf01523a1dabb219;hpb=0783a5ed4d3409bcd7a7e1d908696159999810c8;p=platal.git

diff --git a/bin/cron/emails.check.php b/bin/cron/emails.check.php
index b237e52..e38dfb8 100755
--- a/bin/cron/emails.check.php
+++ b/bin/cron/emails.check.php
@@ -1,7 +1,7 @@
 #!/usr/bin/php5 -q
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2009 Polytechnique.org                              *
+ *  Copyright (C) 2003-2010 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -24,24 +24,40 @@
  */
 $panne_level = 3;
 
-require('./connect.db.inc.php');
+require './connect.db.inc.php';
+require 'Console/Getopt.php';
 
 /*
- * Check duplicated addresses
+ * Parse the command-line options.
  */
-$sql = "SELECT a1.alias, a2.alias, e1.email
-          FROM emails        AS e1
-    INNER JOIN emails        AS e2 ON (e1.email = e2.email AND e1.uid != e2.uid
-                                       AND (e1.uid < e2.uid OR NOT FIND_IN_SET('active', e2.flags)))
-     LEFT JOIN emails_watch  AS w  ON (e1.email = w.email)
-    INNER JOIN aliases       AS a1 ON (a1.id = e1.uid AND a1.type = 'a_vie')
-    INNER JOIN aliases       AS a2 ON (a2.id = e2.uid AND a2.type = 'a_vie')
-    INNER JOIN auth_user_md5 AS u1 ON (a1.id = u1.user_id)
-    INNER JOIN auth_user_md5 AS u2 ON (a2.id = u2.user_id)
-         WHERE FIND_IN_SET('active', e1.flags) AND u1.nom != u2.nom_usage AND u2.nom != u1.nom_usage AND w.email IS NULL
-      ORDER BY a1.alias";
+$opts = Console_GetOpt::getopt($argv, 'v');
+$opt_verbose = false;
 
-$it = Xdb::iterRow($sql);
+if (PEAR::isError($opts)) {
+    echo $opts->getMessage();
+} else {
+    $opts = $opts[0];
+    foreach ($opts as $opt) {
+        if ($opt[0] == 'v') {
+            $opt_verbose = true;
+        }
+    }
+}
+
+/*
+ * Check duplicated addresses
+ */
+$it = Xdb::iterRow("SELECT  al1.alias, al2.alias, e1.email
+                      FROM  emails      AS e1
+                INNER JOIN  emails      AS e2  ON (e1.email = e2.email AND e1.uid != e2.uid
+                                                   AND (e1.uid < e2.uid OR NOT FIND_IN_SET('active', e2.flags)))
+                INNER JOIN  aliases     AS al1 ON (al1.uid = e1.uid AND al1.type = 'a_vie')
+                INNER JOIN  aliases     AS al2 ON (al2.uid = e2.uid AND al2.type = 'a_vie')
+                INNER JOIN  accounts    AS a1  ON (al1.uid = a1.uid)
+                INNER JOIN  accounts    AS a2  ON (al2.uid = a2.uid)
+                 LEFT JOIN  email_watch AS w   ON (e1.email = w.email)
+                     WHERE  FIND_IN_SET('active', e1.flags) AND w.email IS NULL
+                  ORDER BY  al1.alias");
 
 $insert   = array();
 $conflits = array();
@@ -56,8 +72,8 @@ if (count($conflits) > 0) {
         . "https://www.polytechnique.org/admin/emails/duplicated";
 
     echo "\n\n";
-    $sql = "INSERT IGNORE INTO emails_watch (email, state, detection, last)
-                        VALUES " . join(", ", $insert);
+    $sql = "INSERT IGNORE INTO  email_watch (email, state, detection, last)
+                        VALUES  " . join(", ", $insert);
     XDB::execute($sql);
     if (XDB::errno() != 0) {
         echo 'Error : ' . XDB::error() . "\n$sql";
@@ -68,12 +84,12 @@ if (count($conflits) > 0) {
  * Check dead emails
  */
 if ($panne_level > 0) {
-    $sql = "SELECT  e.email, u.hruid
-              FROM  emails  AS e
-        INNER JOIN  auth_user_md5 AS u ON u.user_id = e.uid
-             WHERE  e.panne_level = $panne_level AND e.flags = 'active'
-          ORDER BY  u.hruid";
-    $res = Xdb::query($sql);
+    $res = Xdb::query("SELECT  e.email, a.hruid
+                         FROM  emails   AS e
+                   INNER JOIN  accounts AS a ON (a.uid = e.uid)
+                        WHERE  e.panne_level = {?} AND e.flags = 'active'
+                     ORDER BY  a.hruid",
+                      $panne_level);
 
     if ($res->numRows()) {
         $result = $res->fetchAllAssoc();
@@ -88,9 +104,33 @@ if ($panne_level > 0) {
                        WHERE  panne_level = 3 AND flags = 'active'");
     }
 
-    Xdb::execute("UPDATE  emails
-                     SET  panne_level = $panne_level
-                   WHERE  panne_level > $panne_level");
+    Xdb::execute('UPDATE  emails
+                     SET  panne_level = {?}
+                   WHERE  panne_level > {?}',
+                 $panne_level, $panne_level);
+}
+
+/*
+ * Retrieve the users with no active redirection, but still one working
+ * inactive redirection.
+ */
+if ($opt_verbose) {
+    $res = XDB::query("SELECT  a.hruid, ei.email
+                         FROM  accounts      AS a
+                    LEFT JOIN  emails        AS ea ON (ea.uid = a.uid AND ea.flags = 'active')
+                   INNER JOIN  emails        AS ei ON (ei.uid = a.uid AND ei.flags = '')
+                   INNER JOIN  email_options AS eo ON (eo.uid = a.uid)
+                        WHERE  NOT FIND_IN_SET('googleapps', eo.storage) AND ea.email IS NULL
+                     GROUP BY  a.uid");
+
+    if ($res->numRows()) {
+        $result = $res->fetchAllAssoc();
+        echo "Camarades n'ayant plus d'adresses actives, mais ayant une adresse inactive :\n";
+        foreach ($result as $user) {
+            echo '* ' . $user['email'] . ' pour ' . $user['hruid'] . "\n";
+        }
+    }
+    echo "\n";
 }
 
 // vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: