DataObjects/Core_company.php

[Pman.Core] / Notify.php

diff --git a/Notify.php b/Notify.php
index a35770a..f6b22eb 100644 (file)
--- a/Notify.php
+++ b/Notify.php
@@ -153,23 +153,21 @@ class Pman_Core_Notify extends Pman
          
         //date_default_timezone_set('UTC');
        // phpinfo();exit;
-        
-     
-        
-        $w = DB_DataObject::factory('core_notify_recur');
-        if (is_a($w, 'DB_DataObject')) {
-            $w->generateNotifications();
-        }
         if (!empty($opts['generate'])) {
             $w = DB_DataObject::factory($opts['generate']);
             if (is_a($w, 'DB_DataObject')) {
                 $w->generateNotifications();
             }
             exit;
-            
-            
         }
      
+     
+        
+        $w = DB_DataObject::factory('core_notify_recur');
+        if (is_a($w, 'DB_DataObject')) {
+            $w->generateNotifications();
+        }
+        
         //DB_DataObject::debugLevel(1);
         $w = DB_DataObject::factory($this->table);
         $total = 0;
@@ -232,7 +230,7 @@ class Pman_Core_Notify extends Pman
             $this->logecho("BATCH SIZE: ".  (count($ar) + $total) );
             
             if (empty($ar)) {
-                $this->logecho("COMPLETED MAIN QUEUE - running delated");
+                $this->logecho("COMPLETED MAIN QUEUE - running deleted");
                 
                 if (empty($pushed)) {
                     break;
@@ -249,7 +247,9 @@ class Pman_Core_Notify extends Pman
                 sleep(3);
                 continue;
             }
-            if ($this->poolHasDomain($p->person()->email) > $this->max_to_domain) {
+            $email = $p->person() ? $p->person()->email : $p->to_email;
+            
+            if ($this->poolHasDomain($email) > $this->max_to_domain) {
                 
                 if ($pushed === false) {
                     // we only try once to requeue..
@@ -264,7 +264,7 @@ class Pman_Core_Notify extends Pman
             }
             
             
-            $this->run($p->id,$p->person()->email);
+            $this->run($p->id,$email);