X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Fmassmailer.inc.php;h=f9cc381b2e810dc5bd20dc2ba1d638f4bd08220a;hb=1bf36cd12647c3d2eb8f9ec2a1f0eaad0b5f7e81;hp=decda36ba9b4f19ca2cf4c216cfde6684eb0ccb2;hpb=5b516e6be17378ace0e375b9da14a46051bf0f4e;p=platal.git

diff --git a/include/massmailer.inc.php b/include/massmailer.inc.php
index decda36..f9cc381 100644
--- a/include/massmailer.inc.php
+++ b/include/massmailer.inc.php
@@ -1,6 +1,6 @@
 <?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   *
@@ -165,7 +165,7 @@ abstract class MassMailer
         if (is_null($hash)) {
             $hash = XDB::fetchOneCell("SELECT  hash
                                          FROM  {$this->_subscriptionTable}
-                                        WHERE  user_id = {?}", $user->id());
+                                        WHERE  uid = {?}", $user->id());
         }
         if (is_null($hash)) {
             $hash = $this->createHash(array($user->displayName(), $user->fullName(),
@@ -173,7 +173,7 @@ abstract class MassMailer
                                        rand(), "X.org rulez"));
             XDB::execute("UPDATE  {$this->_subscriptionTable} as ni
                              SET  ni.hash = {?}
-                           WHERE  ni.user_id != {?}",
+                           WHERE  ni.uid != {?}",
                          $hash, $user->id());
         }
 
@@ -192,7 +192,7 @@ abstract class MassMailer
         global $globals;
         return  "SELECT  a.uid
                    FROM  {$this->_subscriptionTable}  AS ni
-             INNER JOIN  accounts AS a ON (ni.user_id = a.uid)
+             INNER JOIN  accounts AS a ON (ni.uid = a.uid)
               LEFT JOIN  email_options AS eo ON (eo.uid = a.uid)
               LEFT JOIN  emails   AS e ON (e.uid = a.uid AND e.flags='active')
                   WHERE  ni.last < {?} AND ({$this->subscriptionWhere()}) AND
@@ -210,7 +210,7 @@ abstract class MassMailer
                 return;
             }
             foreach ($users as $user) {
-                $sent[] = XDB::format('user_id = {?}', $user->id());
+                $sent[] = XDB::format('uid = {?}', $user->id());
                 $this->sendTo($user, $hash);
             }
             XDB::execute("UPDATE  {$this->_subscriptionTable}