DataObjects/Core_email.php

diff --git a/DataObjects/Core_email.php b/DataObjects/Core_email.php
index 382c018..2381219 100644 (file)
--- a/DataObjects/Core_email.php
+++ b/DataObjects/Core_email.php
@@ -175,58 +175,30 @@ class Pman_Core_DataObjects_Core_email extends DB_DataObject
         ");
 
         $this->selectAdd("
-            (
-                SELECT 
-                    COUNT(DISTINCT(crm_person_id))
-                FROM 
-                    core_notify cn 
-                WHERE
-                    evtype = 'MAIL'
-                AND 
-                    person_table = 'crm_person'
-                AND 
-                    crm_person_id != 0 
-                AND
-                    ontable = 'crm_mailing_list_queue'
-                AND 
-                    onid IN 
-                    (
-                        SELECT 
-                            id
-                        FROM 
-                            crm_mailing_list_queue cmlq 
-                        WHERE message_id = crm_mailing_list_message.id
-                    )
-                AND 
-                    is_open = 1
-            )  
-            +
-            (
-                SELECT 
-                    COUNT(DISTINCT(person_id))
-                FROM 
-                    core_notify cn 
-                WHERE
-                    evtype = 'MAIL'
-                AND 
-                    person_table = 'Person'
-                AND 
-                    person_id != 0 
-                AND
-                    ontable = 'crm_mailing_list_queue'
-                AND 
-                    onid IN 
-                    (
-                        SELECT 
-                            id
-                        FROM 
-                            crm_mailing_list_queue cmlq 
-                        WHERE message_id = crm_mailing_list_message.id
-                    )
-                AND 
-                    is_open = 1
-            ) 
-            AS last_sent
+        (
+            SELECT 
+                MAX(sent)
+            FROM 
+                core_notify cn 
+            WHERE
+                evtype = 'MAIL'
+            AND
+                ontable = 'crm_mailing_list_queue'
+            AND 
+                onid IN 
+                (
+                    SELECT 
+                        id
+                    FROM 
+                        crm_mailing_list_queue cmlq 
+                    WHERE message_id = crm_mailing_list_message.id
+                )
+            AND 
+                event_id > 0
+            AND 
+                sent IS NOT NULL
+        ) 
+        AS last_sent,
         ");
        
        if (!empty($_REQUEST['_hide_system_emails'])) {