DataObjects/Core_enum.php

[Pman.Core] / NotifySend.php

diff --git a/NotifySend.php b/NotifySend.php
index c7a3f8f..47d834c 100644 (file)
--- a/NotifySend.php
+++ b/NotifySend.php
@@ -106,6 +106,11 @@ class Pman_Core_NotifySend extends Pman
         }
         if (!empty($opts['debug'])) {
             print_r($w);
+            $ff = HTML_FlexyFramework::get();
+            if (!isset($ff->Core_Mailer)) {
+                $ff->Core_Mailer = array();
+            }
+            HTML_FlexyFramework::get()->Core_Mailer['debug'] = true;
         }
         
         $sent = (empty($w->sent) || preg_match('/^0000/', $w->sent)) ? false : true;
@@ -156,11 +161,14 @@ class Pman_Core_NotifySend extends Pman
         
         // let's work out the last notification sent to this user..
         $l = DB_DataObject::factory($this->table);
-        $l->setFrom( array(
+        
+        $lar = array(
                 'ontable' => $w->ontable,
                 'onid' => $w->onid,
-                'person_id' => $w->person_id,
-        ));        
+        );
+        $lar[strtolower($w->person_table).'_id'] = $w->{strtolower($w->person_table).'_id'};
+        
+        $l->setFrom( $lar );       
         $l->whereAdd('id != '. $w->id);
         $l->orderBy('sent DESC');
         $l->limit(1);
@@ -345,6 +353,15 @@ class Pman_Core_NotifySend extends Pman
                     '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'] == $dom && !empty($ff->Mail['auth'] )) {
+                $mailer->auth = true;
+                $mailer->username = $ff->Mail['username'] ;
+                $mailer->password = $ff->Mail['password'] ;        
+            }
+            
             $res = $mailer->send($p->email, $email['headers'], $email['body']);