X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=Notify.php;h=fd582092af5a14fa15dae313ff2f70dba6e54320;hp=14fc01a2c6b26f65425ba35ebea5459364d9b49e;hb=1524f8b36295809a3eedd6da3c6494f8aa0d86f5;hpb=6b2bfba454cc09d5c58bc9b9e2f76fcdea04eb5c

diff --git a/Notify.php b/Notify.php
index 14fc01a2..fd582092 100644
--- a/Notify.php
+++ b/Notify.php
@@ -56,13 +56,11 @@ class Pman_Core_Notify extends Pman
             'min' => 0,
             'max' => 0,
         ),
-        'generate' => array(
-            'desc' => 'Generate notifications for a table, eg. cash_invoice',
-            'default' => '',
-            'short' => 'g',
-            'min' => 0,
-            'max' => 1,
+       /* removed - use GenerateNotifcations.php hooked classes
+         'generate' =>  'Generate notifications for a table, eg. cash_invoice',
+            
         ),
+        */
          'limit' => array(
             'desc' => 'Limit search for no. to send to ',
             'default' => 1000,
@@ -147,38 +145,26 @@ class Pman_Core_Notify extends Pman
     }
     
     
-    function get($r,$opts)    
+    function get($r,$opts=array())    
     {
         $this->parseArgs($opts); 
          
         //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;
-            
-            
-        }
-     
+        $this->generateNotifications();
+        
+         
         //DB_DataObject::debugLevel(1);
         $w = DB_DataObject::factory($this->table);
+        $total = 0;
         
         if (!empty($opts['old'])) {
             // show old and new...
             
             $w->orderBy('act_when DESC'); // latest first
             $w->limit($opts['limit']); // we can run 
-            
+            $total = min($w->count(), $opts['limit']);
         } else {   
             // standard
             
@@ -191,8 +177,8 @@ class Pman_Core_Notify extends Pman
             }
     
             $w->orderBy('act_when ASC'); // oldest first.
-            
-            $this->logecho("QUEUE is {$w->count()} only runing " . ((int) $opts['limit']));
+            $total = min($w->count(), $opts['limit']);
+            $this->logecho("QUEUE is {$w->count()} only running " . ((int) $opts['limit']));
             
             $w->limit($opts['limit']); // we can run 1000 ...
         }
@@ -207,10 +193,9 @@ class Pman_Core_Notify extends Pman
         $ar = array(); // $w->fetchAll();
         
         if (!empty($opts['list'])) {
-            if (empty($ar)) {
-                die("Nothing in Queue\n");
-            }
-            foreach($ar as $w) {
+            
+            
+            while ($w->fetch()) { 
                 $o = $w->object();
                 
                 
@@ -226,12 +211,13 @@ class Pman_Core_Notify extends Pman
         while (true) {
             if ($w->fetch()) {
                 $ar[] = clone($w);
+                $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;
@@ -248,7 +234,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..
@@ -263,7 +251,7 @@ class Pman_Core_Notify extends Pman
             }
             
             
-            $this->run($p->id,$p->person()->email);
+            $this->run($p->id,$email);
             
             
             
@@ -287,6 +275,42 @@ class Pman_Core_Notify extends Pman
         exit;
     }
     
+    function generateNotifications()
+    {
+        // this should check each module for 'GenerateNotifications.php' class..
+        //and run it if found..
+        $ff = HTML_FlexyFramework::get();
+       
+        $disabled = explode(',', $ff->disable);
+
+        $modules = array_reverse($this->modulesList());
+        
+        // move 'project' one to the end...
+        
+        foreach ($modules as $module){
+            if(in_array($module, $disabled)){
+                continue;
+            }
+            $file = $this->rootDir. "/Pman/$module/GenerateNotifications.php";
+            if(!file_exists($file)){
+                continue;
+            }
+            
+            require_once $file;
+            $class = "Pman_{$module}_GenerateNotifications";
+            $x = new $class;
+            if(!method_exists($x, 'generate')){
+                continue;
+            };
+            //echo "$module\n";
+            $x->generate($this);
+        }
+                
+    
+    }
+    
+    
+    
     function run($id, $email, $cmdOpts="")
     {