Merge branch 'platal-0.10.0'

[platal.git] / bin / cron / emails.check.php

diff --git a/bin/cron/emails.check.php b/bin/cron/emails.check.php
index b6aaf86..b237e52 100755 (executable)
--- a/bin/cron/emails.check.php
+++ b/bin/cron/emails.check.php
@@ -1,7 +1,7 @@
 #!/usr/bin/php5 -q
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2007 Polytechnique.org                              *
+ *  Copyright (C) 2003-2009 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -51,9 +51,9 @@ 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)
@@ -68,18 +68,18 @@ if (count($conflits) > 0) {
  * Check dead emails
  */
 if ($panne_level > 0) {
-    $sql = "SELECT  e.email, a.alias AS forlife
+    $sql = "SELECT  e.email, u.hruid
               FROM  emails  AS e
-        INNER JOIN  aliases AS a ON a.id = e.uid AND a.type = 'a_vie'
+        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";