DataObjects/Core_domain.php

[Pman.Core] / Notify.php

diff --git a/Notify.php b/Notify.php
index 65e7480..10f2419 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;
@@ -229,10 +227,10 @@ class Pman_Core_Notify extends Pman
                 $total--;
             }
             
-            $this->logecho("BATCH SIZE: ".  count($ar) );
+            $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;