Merge commit 'origin/platal-0.10.0'

[platal.git] / modules / poison / poison.inc.php

diff --git a/modules/poison/poison.inc.php b/modules/poison/poison.inc.php
index fdfea00..1429036 100644 (file)
--- a/modules/poison/poison.inc.php
+++ b/modules/poison/poison.inc.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2008 Polytechnique.org                              *
+ *  Copyright (C) 2003-2009 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -26,7 +26,7 @@ function get_poison_emails($seed, $count)
     $fd   = fopen($globals->poison->file, 'r');
     $size = fstat($fd);
     $size = $size['size'];
-    $seed = crc32($seed) % $size;
+    $seed = crc32($seed . date('m-Y')) % $size;
     if ($seed < 0) {
         $seed = $size + $seed;
     }
@@ -38,11 +38,6 @@ function get_poison_emails($seed, $count)
     while (!feof($fd) && $i < $count) {
         $line = trim(fgets($fd));
         if (strlen($line) > 0) {
-            if ($seed % 27 > 13) {
-                $line .= '@' . $globals->mail->domain;
-            } else {
-                $line .= '@' . $globals->mail->domain2;
-            }
             $emails[] = $line;
             ++$seed;
         }
@@ -61,7 +56,10 @@ function randomize_poison_file()
     while (!feof($fd)) {
         $line = trim(fgets($fd));
         if (strlen($line) > 0) {
-            $entries[$line] = md5($line);
+            $m1 = $line . '@' . $globals->mail->domain;
+            $entries[$m1] = md5($m1);
+            $m2 = $line . '@' . $globals->mail->domain2;
+            $entries[$m2] = md5($m2);
         }
     }
     fclose($fd);