fix log errors

[Pman.Core] / DataObjects / Core_notify_server.php

diff --git a/DataObjects/Core_notify_server.php b/DataObjects/Core_notify_server.php
index 0e95ea1..198745b 100644 (file)
--- a/DataObjects/Core_notify_server.php
+++ b/DataObjects/Core_notify_server.php
@@ -117,19 +117,22 @@ class Pman_Core_DataObjects_Core_notify_server extends DB_DataObject
         
         $p->selectAdd();
         $p->selectAdd("id, ((@row_number := CASE WHEN @row_number IS NULL THEN 0 ELSE @row_number END  +1) % {$num_servers})  as rn");
-        $kv = $p->fetchAll('id,rn');
+        $kv = $p->fetchAll('id','rn');
         foreach($kv as $id => $r) {
             $up[ $ids[$r] ][] = $id;
         }
         foreach($up as $sid => $nids) {
+            if (empty($nids)) {
+                continue;
+            }
             $p = DB_DataObject::factory($notify->table);
             $p->query("
                 UPDATE
-                    {$this->table}
+                    {$notify->table}
                 SET
                     server_id = $sid
                 WHERE
-                    id IN (". implode(",', $nids"). ')'
+                    id IN (". implode(',', $nids). ')'
             );
         }
          
@@ -156,7 +159,7 @@ class Pman_Core_DataObjects_Core_notify_server extends DB_DataObject
         $w = DB_DataObject::factory($cn->tableName());
         $w->get($cn->id);
         
-        $servers = $this->availableServerIds();
+        $servers = $this->availableServers();
         $start = 0;
         foreach($servers as $i => $s) {
             if ($s->id == $this->id) {
@@ -164,7 +167,7 @@ class Pman_Core_DataObjects_Core_notify_server extends DB_DataObject
             }
         }
         
-        $offset = ($start + 1)  % count($ids);
+        $offset = ($start + 1)  % count($servers);
         $good = false;
         while ($offset  != $start) {
             $s = $servers[$offset];
@@ -213,11 +216,11 @@ class Pman_Core_DataObjects_Core_notify_server extends DB_DataObject
             return true;
         }
         
-        return ralse; 
+        return false; 
     }
     function initHelo()
     {
-        
+        $ff = HTML_FlexyFramework::get();
         $ff->Mail['helo'] = $this->helo;
         
     }
@@ -227,15 +230,16 @@ class Pman_Core_DataObjects_Core_notify_server extends DB_DataObject
         $bl->server_id = $this->id;
         $bl->domain_id = $core_domain->id;
         if ($bl->count()) {
-            return;
+            return true;
         }
         // is it a blacklist message
         if (!$bl->messageIsBlacklisted($errmsg)) {
-            return;
+            return false;
         }
+        $bl->error_str = $errmsg;
         $bl->added_dt = $bl->sqlValue("NOW()");
         $bl->insert();
-        
+        return true;
         
     }