sync

[Pman.Admin] / Report / SendEventErrors.php

diff --git a/Report/SendEventErrors.php b/Report/SendEventErrors.php
index 546a7cd..d2aa0f8 100644 (file)
--- a/Report/SendEventErrors.php
+++ b/Report/SendEventErrors.php
@@ -1,5 +1,5 @@
 <?php
-
+ 
 require_once 'Pman/Roo.php';
 
 class Pman_Admin_Report_SendEventErrors extends Pman_Roo
@@ -63,7 +63,14 @@ class Pman_Admin_Report_SendEventErrors extends Pman_Roo
             'default' => '',
             'min' => 1,
             'max' => 1,
-        )
+        ),
+        'debug' => array(
+            'desc' => 'Turn on database debugging',
+            'short' => 'd',
+            'default' => '',
+            'min' => 1,
+            'max' => 1,
+        ), 
     );
     
     function getAuth()
@@ -77,11 +84,14 @@ class Pman_Admin_Report_SendEventErrors extends Pman_Roo
         return true;
     }
     
-    function get($args, $opts)
+    function get($args,   $opts = Array())
     {
         $this->opts = $opts;
         
+        if (!empty($this->opts['debug'])) {
+            DB_DataObject::debugLevel(1);
           
+        }
         if(!empty($this->opts['list'])){
             $this->listTypes();
         }
@@ -90,25 +100,17 @@ class Pman_Admin_Report_SendEventErrors extends Pman_Roo
             $this->jerr('Missing group - try add [-t {group name}]');
         }
         
-        $rcpts = DB_DataObject::factory('groups')->lookupMembers("{$this->opts['group']}",'email');
-        
-        
-        if(empty($rcpts)){
-            $this->jerr("{$this->opts['group']} does not has any memeber");
-        }
-        // see the last date of notification to these users...
-        $rcpt_ids = DB_DataObject::factory('groups')->lookupMembers("{$this->opts['group']}",'id');
-        
         $min = 0;
-        
-        $events = DB_DataObject::factory('Events');
-        $events->action = 'ERROR-REPORT-' . $this->opts['uid'];
-        $events->orderBy('id DESC');
-        $events->limit(1);        
-        if ($events->find(true)) {
-            $min = $events->id;
+         
+        if ($this->opts['uid'] != 'STD') {
+            $events = DB_DataObject::factory('Events');
+            $events->action = 'ERROR-REPORT-' . $this->opts['uid'];
+            $events->orderBy('id DESC');
+            $events->limit(1);        
+            if ($events->find(true)) {
+                $min = $events->id;
+            }
         }
-    
         
         
         $events = DB_DataObject::factory('Events');
@@ -117,8 +119,8 @@ class Pman_Admin_Report_SendEventErrors extends Pman_Roo
             DISTINCT(Events.action) AS action,
             COUNT(Events.id) AS total
         ");
-        $events->whereAdd('id > '. $min);
-        
+        $events->whereAdd('Events.id > '. $min);
+        $events->whereAdd("Events.action NOT LIKE 'ERROR-REPORT-%'");
         $events->whereAdd("Events.event_when > NOW() - INTERVAL 1 DAY");
         
         if(!empty($this->opts['exclude'])){
@@ -171,7 +173,8 @@ class Pman_Admin_Report_SendEventErrors extends Pman_Roo
             
         ");
         $events->selectAddPersonEmail();
-        
+        $events->whereAdd("Events.action NOT LIKE 'ERROR-REPORT-%'");
+        $events->whereAdd('Events.id > '. $min);
         $events->whereAdd("Events.event_when > NOW() - INTERVAL 1 DAY");
         
         $exclude = array_unique(array_filter(array_map('trim', explode(',', $this->opts['exclude']))));
@@ -207,8 +210,8 @@ class Pman_Admin_Report_SendEventErrors extends Pman_Roo
         
         
         $content = array(
-            'template'      => 'EVENT_ERRORS_REPORT',
-            'rcpts'         => $rcpts,
+            'template'      => 'FILE_REPORTING_EMAIL',
+            'rcpts_group'   => $this->opts['group'],
             'errors'        => $errors,
             'subject'       => $subject
         );
@@ -225,7 +228,7 @@ class Pman_Admin_Report_SendEventErrors extends Pman_Roo
     
     function listTypes()
     {
-         $events = DB_DataObject::factory('Events');
+        $events = DB_DataObject::factory('Events');
         $events->selectAdd();
         $events->selectAdd("
             DISTINCT(Events.action) AS action
@@ -238,5 +241,10 @@ class Pman_Admin_Report_SendEventErrors extends Pman_Roo
         
     }
     
+    static function test_EVENT_ERRORS_REPORT($pg, $to)
+    {
+        $this->jerr("Not implemented");
+    }
+    
     
 }
\ No newline at end of file