X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=Notify.php;h=fd582092af5a14fa15dae313ff2f70dba6e54320;hp=3775456b760dc9aa1408c01c8484b458c473c2b8;hb=1524f8b36295809a3eedd6da3c6494f8aa0d86f5;hpb=03246410a48c6defa202d0dc8506526f460368ce

diff --git a/Notify.php b/Notify.php
index 3775456b..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,31 +145,16 @@ class Pman_Core_Notify extends Pman
     }
     
     
-    function get($r,$opts)    
+    function get($r,$opts=array())    
     {
         $this->parseArgs($opts); 
          
         //date_default_timezone_set('UTC');
         
         
+        $this->generateNotifications();
         
-        
-       // phpinfo();exit;
-        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;
@@ -296,14 +279,16 @@ class Pman_Core_Notify extends Pman
     {
         // 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, $this->disabled)){
+            if(in_array($module, $disabled)){
                 continue;
             }
             $file = $this->rootDir. "/Pman/$module/GenerateNotifications.php";