Notify.php

[Pman.Core] / Notify.php

diff --git a/Notify.php b/Notify.php
index e7d5157..51c262c 100644 (file)
--- a/Notify.php
+++ b/Notify.php
@@ -42,7 +42,7 @@ class Pman_Core_Notify extends Pman
             
         ),
         'old' => array(
-            'desc' => 'Show old messages..',
+            'desc' => 'Show old messages.. (and new messages...)',
             'default' => 0,
             'short' => 'o',
             'min' => 0,
@@ -114,15 +114,13 @@ class Pman_Core_Notify extends Pman
         if (!$ff->cli) {
             die("access denied");
         }
-        $sig = $_SERVER["SCRIPT_NAME"] .'|'. __FILE__;
-        //echo "SIG: $sig\n";
-        HTML_FlexyFramework::ensureSingle($sig, $this);
+        HTML_FlexyFramework::ensureSingle($_SERVER["SCRIPT_NAME"] .'|'. __FILE__, $this);
         return true;
     }
     
     var $pool = array();
     
-    function get($r,$opts)    
+    function parseArgs(&$opts)
     {
         if ($opts['debug']) {
             DB_DataObject::debugLevel($opts['debug']);
@@ -136,9 +134,7 @@ class Pman_Core_Notify extends Pman
         if (empty($opts['limit'])) {
             $opts['limit'] = '1000'; // not sure why it's not picking up the defautl..
         }
-        //date_default_timezone_set('UTC');
-       // phpinfo();exit;
-        $showold = !empty($opts['old']);
+        
         if (!empty($opts['old'])) {
             $opts['list'] = 1; // force listing..
         }
@@ -148,6 +144,16 @@ class Pman_Core_Notify extends Pman
         if (!empty($opts['send-to'])) {
             $this->send_to = $opts['send-to'];
         }
+    }
+    
+    
+    function get($r,$opts)    
+    {
+        $this->parseArgs($opts); 
+         
+        //date_default_timezone_set('UTC');
+       // phpinfo();exit;
+        
      
         
         $w = DB_DataObject::factory('core_notify_recur');
@@ -167,9 +173,13 @@ class Pman_Core_Notify extends Pman
         //DB_DataObject::debugLevel(1);
         $w = DB_DataObject::factory($this->table);
         
-        
-        if (!$showold) {
+        if (!empty($opts['old'])) {
+            // show old and new...
             
+            $w->orderBy('act_when DESC'); // latest first
+            $w->limit($opts['limit']); // we can run 
+            
+        } else {   
             // standard
             
             //$w->whereAdd('act_when > sent'); // eg.. sent is not valid..
@@ -184,11 +194,9 @@ class Pman_Core_Notify extends Pman
             
             $this->logecho("QUEUE is {$w->count()}");
             
-            $w->limit($opts['limit']); // we can run 1000 ...
-        } else {
-            $w->orderBy('act_when DESC'); // latest first
             $w->limit($opts['limit']); // we can run 1000 ...
         }
+        
         if (!empty($this->evtype)) {
             $w->evtype = $this->evtype;
         }
@@ -344,6 +352,7 @@ class Pman_Core_Notify extends Pman
                 'cmd' => $cmd,
                 'email' => $email,
                 'pipes' => $pipes,
+                'notify_id' => $id,
                 'started' => time()