use to_group_id in core_email

[Pman.Core] / Notify.php

diff --git a/Notify.php b/Notify.php
index 179b4e8..98ce558 100644 (file)
--- a/Notify.php
+++ b/Notify.php
@@ -145,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;
@@ -294,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";
@@ -479,9 +466,11 @@ class Pman_Core_Notify extends Pman
     function poolHasDomain($email)
     {
         $ret = 0;
-        $dom = strtolower(array_pop(explode('@',$email)));
+        $ea = explode('@',$email);
+        $dom = strtolower(array_pop($ea));
         foreach($this->pool as $p) {
-            $mdom = strtolower(array_pop(explode('@',$p['email'])));
+            $ea = explode('@',$p['email']);
+            $mdom = strtolower(array_pop($ea));
             if ($mdom == $dom) {
                 $ret++;
             }