DataObjects/ProjectDirectory.php

[Pman.Core] / Notify.php

diff --git a/Notify.php b/Notify.php
index 3b87670..dc3558c 100644 (file)
--- a/Notify.php
+++ b/Notify.php
@@ -31,10 +31,25 @@ class Pman_Core_Notify extends Pman
             'desc' => 'List message to send, do not send them..',
             'default' => 0,
             'short' => 'l',
-            'min' => 1,
-            'max' => 1,
+            'min' => 0,
+            'max' => 0,
             
-        )
+        ),
+        'old' => array(
+            'desc' => 'Show old messages..',
+            'default' => 0,
+            'short' => 'o',
+            'min' => 0,
+            'max' => 0,
+            
+        ),
+         'force' => array(
+            'desc' => 'Force redelivery, even if it has been sent before or not queued...',
+            'default' => 0,
+            'short' => 'f',
+            'min' => 0,
+            'max' => 0,
+        ),
     );
     
     
@@ -61,38 +76,58 @@ class Pman_Core_Notify extends Pman
     {
         if ($opts['debug']) {
             DB_DataObject::debugLevel($opts['debug']);
+            print_r($opts);
         }
         //date_default_timezone_set('UTC');
        // phpinfo();exit;
+        $showold = !empty($opts['old']);
+        if (!empty($opts['old'])) {
+            $opts['list'] = 1; // force listing..
+        }
         
-        
+        $this->force = empty($opts['force']) ? 0 : 1;
+     
+        if (!empty($opts['send-to'])) {
+            $this->send_to = $opts['send-to'];
+        }
+     
         
         $w = DB_DataObject::factory($this->table);
-        $w->whereAdd('act_when > sent'); // eg.. sent is not valid..
-        $w->whereAdd('act_when < NOW()'); // eg.. not if future..
-
-        $w->orderBy('act_when ASC'); // oldest first.
+        
+        if (!$showold) {
+            $w->whereAdd('act_when > sent'); // eg.. sent is not valid..
+            
+            if (!$this->force) {
+                $w->whereAdd('act_when < NOW()'); // eg.. not if future..
+            }
+    
+            $w->orderBy('act_when ASC'); // oldest first.
+            $w->limit(1000); // we can run 1000 ...
+        } else {
+            $w->orderBy('act_when DESC'); // latest first
+            $w->limit(50); // we can run 1000 ...
+        }
         if (!empty($this->evtype)) {
             $w->evtype = $this->evtype;
         }
         
         $w->autoJoin();
-        $w->limit(1000); // we can run 1000 ...
+        
         
         $ar = $w->fetchAll();
         
         if (!empty($opts['list'])) {
+            if (empty($ar)) {
+                die("Nothing in Queue\n");
+            }
             foreach($ar as $w) {
                 $o = $w->object();
-                $p = $w->person();
                 
-                echo "$e->id : $w->email    : ". $w->toEventString()."\n";
+                
+                echo "$w->id : $w->person_id_email email    : ".
+                        $o->toEventString()."    ". $w->status() . "\n";
             }
             exit;
-            
-            
-            
-            
         }
         
         
@@ -140,7 +175,14 @@ class Pman_Core_Notify extends Pman
         
         $cwd = $sn[0] == '/' ? dirname($sn) : dirname(realpath(getcwd() . $sn)); // same as run on.. (so script should end up being same relatively..)
         $app = $cwd . '/' . basename($_SERVER["SCRIPT_NAME"]) . '  ' . $this->target . '/'. $id;
+        if ($this->force) {
+            $app .= ' -f';
+        }
+        if (!empty($this->send_to)) {
+            $app .= ' --sent-to='.escapeshellarg($this->send_to);
+        }
         $cmd = $php . ' ' . $app. ' &';
+        
         echo $cmd . "\n";
         $pipe = array();
         $p = proc_open($cmd, $descriptorspec, $pipes, $cwd );