Merge remote branch 'origin/master' into account

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

diff --git a/bin/cron/homonymes.php b/bin/cron/homonymes.php
index 9cfc622..cda0f68 100755 (executable)
--- a/bin/cron/homonymes.php
+++ b/bin/cron/homonymes.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   *
@@ -19,25 +19,29 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************/
-/* vim: set sw=4 ts=4 sts=4 tw=100:
- * crée des demandes de validation pour les kill d'alias
- * une demande 10 jours avant pour un warning, puis une autre pour le robot
-*/
 
-$W_PERIOD = "INTERVAL 7 DAY"; // temps d'envoi du warning avant la deadline
+/**
+ * Requires destruction of aliases: a first notification 10 days before
+ * destruction, a second on the date.
+ */
+require 'connect.db.inc.php';
+require_once 'validations/homonymes.inc.php';
 
-require('./connect.db.inc.php');
+$resRobot = XDB::iterator("SELECT  uid, alias, expire
+                             FROM  aliases
+                            WHERE  (expire = NOW() + INTERVAL 7 DAY OR expire <= NOW())
+                                   AND type = 'alias'");
+while ($old = $resRobot->next()) {
+    $res = XDB::query('SELECT  a.hruid
+                         FROM  homonyms AS h
+                   INNER JOIN  accounts AS a (h.uid = a.uid)
+                        WHERE  homonyme_id = {?}',
+                      $old['id']);
+    $hruids = $res->fetchColumn();
 
-$resRobot = XDB::iterator("SELECT id, alias, expire FROM aliases WHERE (expire = NOW() + $W_PERIOD OR expire <= NOW()) AND type = 'alias'");
-
-if ($resRobot->total()) {
-    require_once('validations/homonymes.inc.php');
-    while ($old = $resRobot->next()) {
-       $res = XDB::query("SELECT alias AS forlife FROM homonymes INNER JOIN aliases ON(user_id = id) WHERE homonyme_id = {?} AND type='a_vie'", $old['id']);
-       $forlifes = $res->fetchColumn();
-       $req = new HomonymeReq($old['id'], $old['alias'], $forlifes, $old['expire'] > date("Y-m-d"));
-       $req->submit();
-    }
+    $homonym = User::getSilent($old['id']);
+    $req = new HomonymeReq($homonym, $old['alias'], $hruids, $old['expire'] > date("Y-m-d"));
+    $req->submit();
 }
 
 // vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: