DataObjects/Core_event_audit.php

[Pman.Core] / Notify.php

diff --git a/Notify.php b/Notify.php
index e627d6f..dc3558c 100644 (file)
--- a/Notify.php
+++ b/Notify.php
@@ -16,6 +16,44 @@ require_once 'Pman.php';
 class Pman_Core_Notify extends Pman
 {
     
+    static $cli_desc = "Send out notification emails (usually from cron)";
+    
+    static $cli_opts = array(
+        'debug' => array(
+            'desc' => 'Turn on debugging (see DataObjects debugLevel )',
+            'default' => 0,
+            'short' => 'v',
+            'min' => 1,
+            'max' => 1,
+            
+        ),
+        'list' => array(
+            'desc' => 'List message to send, do not send them..',
+            'default' => 0,
+            'short' => 'l',
+            '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,
+        ),
+    );
+    
+    
+    
     var $table = 'core_notify';
     var $target = 'Core/NotifySend';
     var $evtype = ''; // any notification...
@@ -34,26 +72,66 @@ class Pman_Core_Notify extends Pman
     
     var $pool = array();
     
-    function get()    
+    function get($r,$opts)    
     {
-       //DB_DataObject::debugLevel(1);
+        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();
+                
+                
+                echo "$w->id : $w->person_id_email email    : ".
+                        $o->toEventString()."    ". $w->status() . "\n";
+            }
+            exit;
+        }
+        
+        
+        
         while (true) {
             if (empty($ar)) {
                 break;
@@ -65,7 +143,7 @@ class Pman_Core_Notify extends Pman
                 sleep(3);
                 continue;
             }
-            if (!$this->poolHasDomain($p->person_id_email)) {
+            if ($this->poolHasDomain($p->person_id_email)) {
                 $ar[] = $p; // push it on the end..
                 echo "domain {$p->person_id_email} already on queue, pushing to end.\n";
                 sleep(3);
@@ -97,8 +175,15 @@ 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";
+        
+        echo $cmd . "\n";
         $pipe = array();
         $p = proc_open($cmd, $descriptorspec, $pipes, $cwd );
         $this->pool[] = array(
@@ -137,7 +222,7 @@ class Pman_Core_Notify extends Pman
      */
     function poolHasDomain($email)
     {
-        $dom = strotlower(array_pop(explode('@',$email)));
+        $dom = strtolower(array_pop(explode('@',$email)));
         foreach($this->pool as $p) {
             $mdom = strtolower(array_pop(explode('@',$p['email'])));
             if ($mdom == $dom) {