X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=NotifySend.php;h=b07a81c8017aec57dacb3da89940a451b909f4d2;hb=dff7116c31985c523f927df3e8e7cf50670ef428;hp=0228298fd24d9673a0e72c5f00e54f9fa4838f57;hpb=74c1422a58ce57c2159e719fcf3ebdc2d7dca01b;p=Pman.Core

diff --git a/NotifySend.php b/NotifySend.php
index 0228298f..b07a81c8 100644
--- a/NotifySend.php
+++ b/NotifySend.php
@@ -83,7 +83,7 @@ class Pman_Core_NotifySend extends Pman
         
     }
    
-    function get($id,$opts)
+    function get($id,$opts=array())
     {
         
         //print_r($opts);
@@ -120,7 +120,7 @@ class Pman_Core_NotifySend extends Pman
         if (!$force && (!empty($w->msgid) || $sent)) {
             $ww = clone($w);
             if (!$sent) { 
-                $w->sent = $w->sqlValue("NOW()");
+                $w->sent = $w->sent == '0000-00-00 00:00:00' ? $w->sqlValue('NOW()') :$w->sent; // do not update if sent.....
                 $w->update($ww);
             }    
             $this->errorHandler("message has been sent already.\n");
@@ -133,7 +133,7 @@ class Pman_Core_NotifySend extends Pman
             $ev = $this->addEvent('NOTIFY', $w,
                             "Notification event cleared (underlying object does not exist)" );;
             $ww = clone($w);
-            $w->sent = date('Y-m-d H:i:s');
+            $w->sent = $w->sent == '0000-00-00 00:00:00' ? $w->sqlValue('NOW()') :$w->sent; // do not update if sent.....
             $w->msgid = '';
             $w->event_id = $ev->id;
             $w->update($ww);
@@ -150,7 +150,7 @@ class Pman_Core_NotifySend extends Pman
             $ev = $this->addEvent('NOTIFY', $w,
                             "Notification event cleared (not user not active any more)" );;
             $ww = clone($w);
-            $w->sent = date('Y-m-d H:i:s');
+            $w->sent = $w->sent == '0000-00-00 00:00:00' ? $w->sqlValue('NOW()') :$w->sent; // do not update if sent.....
             $w->msgid = '';
             $w->event_id = $ev->id;
             $w->update($ww);
@@ -204,7 +204,7 @@ class Pman_Core_NotifySend extends Pman
             $ev = $this->addEvent('NOTIFY', $w,
                             "Notification event cleared (not required any more)" );;
             $ww = clone($w);
-            $w->sent = date('Y-m-d H:i:s');
+            $w->sent = (!$w->sent || $w->sent == '0000-00-00 00:00:00') ? $w->sqlValue('NOW()') : $w->sent; // do not update if sent.....
             $w->msgid = '';
             $w->event_id = $ev->id;
             $w->update($ww);
@@ -230,7 +230,7 @@ class Pman_Core_NotifySend extends Pman
             $ev = $this->addEvent('NOTIFY', $w, isset($email['error'])  ?
                             $email['error'] : "INTERNAL ERROR  - We can not handle " . $w->ontable); 
             $ww = clone($w);
-            $w->sent = date('Y-m-d H:i:s');
+            $w->sent = (!$w->sent || $w->sent == '0000-00-00 00:00:00') ? $w->sqlValue('NOW()') : $w->sent; // do not update if sent.....
             $w->msgid = '';
             $w->event_id = $ev->id;
             $w->update($ww);
@@ -278,7 +278,7 @@ class Pman_Core_NotifySend extends Pman
         if (!Validate::email($p->email, true)) {
             $ev = $this->addEvent('NOTIFY', $w, "INVALID ADDRESS: " . $p->email);
             $ww = clone($w);
-            $w->sent = date('Y-m-d H:i:s');
+            $w->sent = (!$w->sent || $w->sent == '0000-00-00 00:00:00') ? $w->sqlValue('NOW()') : $w->sent; // do not update if sent.....
             $w->msgid = '';
             $w->event_id = $ev->id;
             $w->update($ww);
@@ -289,8 +289,8 @@ class Pman_Core_NotifySend extends Pman
         
         $ff = HTML_FlexyFramework::get();
         
-        
-        $dom = array_pop(explode('@', $p->email));
+        $explode_email = explode('@', $p->email);
+        $dom = array_pop($explode_email);
         
         $mxs = $this->mxs($dom);
         $ww = clone($w);
@@ -325,7 +325,7 @@ class Pman_Core_NotifySend extends Pman
             }
             
             $ev = $this->addEvent('NOTIFY', $w, "BAD ADDRESS - BAD DOMAIN - ". $p->email );
-            $w->sent = date('Y-m-d H:i:s');
+            $w->sent = (!$w->sent || $w->sent == '0000-00-00 00:00:00') ? $w->sqlValue('NOW()') : $w->sent; // do not update if sent.....
             $w->msgid = '';
             $w->event_id = $ev->id;
             $w->update($ww);
@@ -339,7 +339,7 @@ class Pman_Core_NotifySend extends Pman
         
         if (!$force && strtotime($w->act_start) <  strtotime('NOW - 14 DAY')) {
             $ev = $this->addEvent('NOTIFY', $w, "BAD ADDRESS - GIVE UP - ". $p->email );
-            $w->sent = date('Y-m-d H:i:s');
+            $w->sent = (!$w->sent || $w->sent == '0000-00-00 00:00:00') ? $w->sqlValue('NOW()') :$w->sent; // do not update if sent.....
             $w->msgid = '';
             $w->event_id = $ev->id;
             $w->update($ww);
@@ -350,7 +350,8 @@ class Pman_Core_NotifySend extends Pman
         
         $w->to_email = $p->email; 
         //$this->addEvent('NOTIFY', $w, 'GREYLISTED ' . $p->email . ' ' . $res->toString());
-        $w->act_when = date('Y-m-d H:i:s', strtotime('NOW + ' . $retry . ' MINUTES'));
+        // we can only update act_when if it has not been sent already (only happens when running in force mode..)
+        $w->act_when =  (!$w->act_when || $w->act_when == '0000-00-00 00:00:00') ? date('Y-m-d H:i:s', strtotime('NOW + ' . $retry . ' MINUTES')) : $w->act_when;
         $w->update($ww);
         
         $ww = clone($w);   
@@ -382,73 +383,68 @@ class Pman_Core_NotifySend extends Pman
                     //'debug' => isset($opts['debug']) ?  1 : 0,
                     'debug' => 1,
                     'debug_handler' => array($this, 'debugHandler')
-                ));
+            ));
             
             // if the host is the mail host + it's authenticated add auth details
             // this normally will happen if you sent  Pman_Core_NotifySend['host']
+             
+            
             if (isset($ff->Mail['host']) && $ff->Mail['host'] == $mx && !empty($ff->Mail['auth'] )) {
                 
-                $username = $ff->Mail['username'] ;
-                $password = $ff->Mail['password'] ;
+                $mailer->auth = true;
+                $mailer->username = $ff->Mail['username'];
+                $mailer->password = $ff->Mail['password'];        
+            }
+            
+            if(!empty($ff->Core_Notify) && !empty($ff->Core_Notify['routes'])){
                 
-                if(!empty($ff->Core_Notify) && !empty($ff->Core_Notify['routes'])){
+                // we might want to regex 'office365 as a mx host 
+                foreach ($ff->Core_Notify['routes'] as $server => $settings){
+                    if(!in_array($dom, $settings['domains'])){
+                        continue;
+                    }
                     
-                    foreach ($ff->Core_Notify['routes'] as $server => $settings){
-                        if(!in_array($dom, $settings['domains'])){
-                            continue;
-                        }
-                        
-                        // what's the minimum timespan.. - if we have 60/hour.. that's 1 every minute.
-                        // if it's newer that '1' minute...
-                        // then shunt it..
-                        
-                        $seconds = floor((60 * 60) / $settings['rate']);
-                        
-                        $core_notify = DB_DataObject::factory($this->table);
-                        $core_notify->domain_id = $core_domain->id;
-                        $core_notify->whereAdd("
-                            sent >= NOW() - INTERVAL $seconds SECONDS
-                        ");
-                        
-                        if($core_notify->count()){
-                            $old = clone($w);
-                            $w->act_when = date("Y-m-d H:i:s", time() + $seconds);
-                            $w->update($old);
-                            $this->errorHandler(date('Y-m-d h:i:s ') . " Too many emails sent by {$dom}");
-                        }
-                        
-                        // that make's this test obsolete...
-                        /*
-                        
-                        $core_notify = DB_DataObject::factory($this->table);
-                        $core_notify->domain_id = $core_domain->id;
-                        $core_notify->whereAdd("
-                            sent >= NOW() - INTERVAL 1 HOUR
-                        ");
-                        
-                        if($core_notify->count() >= $settings['rate']){
-                            $old = clone($w);
-                            $w->act_when = date("Y-m-d H:i:s", strtotime('+1 HOUR'));
-                            $w->update($old);
-                            $this->errorHandler(date('Y-m-d h:i:s ') . " Too many emails sent by {$dom}");
-                        }
-                        */
-                        
-                        
-                        
-                        $mailer->host = $server;
-                        $username = $settings['username'];
-                        $password = $settings['password'];
+                    // what's the minimum timespan.. - if we have 60/hour.. that's 1 every minute.
+                    // if it's newer that '1' minute...
+                    // then shunt it..
+                    
+                    $settings['rate'] = isset( $settings['rate']) ?  $settings['rate']  : 360;
+                    
+                    $seconds = floor((60 * 60) / $settings['rate']);
+                    
+                    $core_notify = DB_DataObject::factory($this->table);
+                    $core_notify->domain_id = $core_domain->id;
+                    $core_notify->whereAdd("
+                        sent >= NOW() - INTERVAL $seconds SECOND
+                    ");
+                    
+                    if($core_notify->count()){
+                        $old = clone($w);
+                        $w->act_when = date("Y-m-d H:i:s", time() + $seconds);
+                        $w->update($old);
+                        $this->errorHandler(date('Y-m-d h:i:s ') . " Too many emails sent by {$dom}");
+                    }
+                     
+                    
+                    
+                    $mailer->host = $server;
+                    $mailer->auth = isset($settings['auth']) ? $settings['auth'] : true;
+                    $mailer->username = $settings['username'];
+                    $mailer->password = $settings['password'];
+                    if (isset($settings['port'])) {
+                        $mailer->port = $settings['port'];
+                    }
+                    if (isset($settings['socket_options'])) {
+                        $mailer->socket_options = $settings['socket_options'];
                         
-                        break;
                     }
                     
+                    
+                    break;
                 }
                 
-                $mailer->auth = true;
-                $mailer->username = $username;
-                $mailer->password = $password;        
             }
+        
             
             $res = $mailer->send($p->email, $email['headers'], $email['body']);
              
@@ -466,7 +462,7 @@ class Pman_Core_NotifySend extends Pman
                     $w->act_when = date('Y-m-d H:i:s');
                 }
                 
-                $w->sent = date('Y-m-d H:i:s');
+                $w->sent = (!$w->sent || $w->sent == '0000-00-00 00:00:00') ? $w->sqlValue('NOW()') : $w->sent; // do not update if sent.....
                 $w->msgid = $email['headers']['Message-Id'];
                 $w->event_id = $ev->id; // sent ok.. - no need to record it..
                 $w->domain_id = $core_domain->id;
@@ -537,7 +533,7 @@ class Pman_Core_NotifySend extends Pman
             
             $ev = $this->addEvent('NOTIFY', $w, ($fail ? "FAILED - " : "RETRY TIME EXCEEDED - ") .
                        $errmsg);
-            $w->sent = date('Y-m-d H:i:s');
+            $w->sent = (!$w->sent || $w->sent == '0000-00-00 00:00:00') ? $w->sqlValue('NOW()') : $w->sent; // do not update if sent.....
             $w->msgid = '';
             $w->event_id = $ev->id;
             $w->domain_id = $core_domain->id;
@@ -548,7 +544,7 @@ class Pman_Core_NotifySend extends Pman
         // handle no host availalbe forever...
         if (strtotime($w->act_start) < strtotime('NOW - 3 DAYS')) {
             $ev = $this->addEvent('NOTIFY', $w, "RETRY TIME EXCEEDED - ". $p->email);
-            $w->sent = date('Y-m-d H:i:s');
+            $w->sent = (!$w->sent || $w->sent == '0000-00-00 00:00:00') ? $w->sqlValue('NOW()') : $w->sent; // do not update if sent.....
             $w->msgid = '';
             $w->event_id = $ev->id;
             $w->domain_id = $core_domain->id;
@@ -621,7 +617,11 @@ class Pman_Core_NotifySend extends Pman
             return $object->$m($rcpt, $last_sent_date, $notify, $force);
         }
                 
-        if (!method_exists($object, 'toEmail')) {
+        if (method_exists($object, 'toMailerData')) {
+            return $object->toMailerData(array(
+                'rcpts'=>$rcpt,
+                'person'=>$rcpt, // added as mediaoutreach used this?
+            )); //this is core_email - i think it's only used for testing...
             //var_Dump($object);
             //exit;
         }
@@ -647,6 +647,7 @@ class Pman_Core_NotifySend extends Pman
     {
         $this->debug_str .= strlen($this->debug_str) ? "\n" : '';
         $this->debug_str .= $message;
+        //echo $message ."\n";
     }
     
     function errorHandler($msg, $success = false)