X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=bin%2Fcron%2Femails.check.php;h=61c68674380d506e3d133ee69e2f037697b3603e;hb=fe13bc1d7ba9f72d452ec07baf8538a74b7c67b8;hp=c9690c9e8f7666717c0d70214d3073722c88828c;hpb=756ff73fbb0cdd01cce2eda27ba18e1cc99bd735;p=platal.git

diff --git a/bin/cron/emails.check.php b/bin/cron/emails.check.php
index c9690c9..61c6867 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-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   *
@@ -25,21 +25,39 @@
 $panne_level = 3;
 
 require('./connect.db.inc.php');
+require("Console/Getopt.php");
+
+/*
+ * Parse the command-line options.
+ */
+$opts = Console_GetOpt::getopt($argv, 'v');
+$opt_verbose = false;
+
+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
  */
-$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
+$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";
+     LEFT JOIN  email_watch  AS w  ON (e1.email = w.email)
+    INNER JOIN  aliases       AS a1 ON (a1.uid = e1.uid AND a1.type = 'a_vie')
+    INNER JOIN  aliases       AS a2 ON (a2.uid = e2.uid AND a2.type = 'a_vie')
+    INNER JOIN  auth_user_md5 AS u1 ON (a1.uid = u1.user_id)
+    INNER JOIN  auth_user_md5 AS u2 ON (a2.uid = 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";
 
 $it = Xdb::iterRow($sql);
 
@@ -51,13 +69,13 @@ while (list($alias1, $alias2, $mail) = $it->next()) {
 }
 
 if (count($conflits) > 0) {
-    echo "Nouvelles adresses en doublon detectees :\n" . join("\n", $conflits)
-        . "\n\nVous pouvez entrer les informations collectees a ce sujet sur la page :\n"
-        . "http://www.polytechnique.org/admin/emails/duplicated";
+    echo "Nouvelles adresses en doublon détectées :\n" . join("\n", $conflits)
+        . "\n\nVous pouvez entrer les informations collectées à ce sujet sur la page :\n"
+        . "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,18 +86,18 @@ if (count($conflits) > 0) {
  * Check dead emails
  */
 if ($panne_level > 0) {
-    $sql = "SELECT  e.email, a.alias AS forlife
-              FROM  emails  AS e
-        INNER JOIN  aliases AS a ON a.id = e.uid AND a.type = 'a_vie'
+    $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  a.alias";
+          ORDER BY  u.hruid";
     $res = Xdb::query($sql);
 
     if ($res->numRows()) {
         $result = $res->fetchAllAssoc();
         echo "Nouvelles adresses en panne detectees :\n";
         foreach ($result as $assoc) {
-            echo '* ' . $assoc['email'] . ' pour ' . $assoc['forlife'] . "\n";
+            echo '* ' . $assoc['email'] . ' pour ' . $assoc['hruid'] . "\n";
         }
         echo "\n\n";
 
@@ -93,5 +111,27 @@ if ($panne_level > 0) {
                    WHERE  panne_level > $panne_level");
 }
 
+/*
+ * Retrieve the users with no active redirection, but still one working
+ * inactive redirection.
+ */
+if ($opt_verbose) {
+    $res = XDB::query("SELECT  u.hruid, ei.email
+                         FROM  auth_user_md5   AS u
+                    LEFT JOIN  emails          AS ea ON (ea.uid = u.user_id AND ea.flags='active')
+                   INNER JOIN  emails          AS ei ON (ei.uid = u.user_id AND ei.flags='')
+                        WHERE  FIND_IN_SET('googleapps', u.mail_storage) = 0 AND ea.email IS NULL
+                     GROUP BY  u.user_id");
+
+    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:
 ?>