X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=DataObjects%2FCore_email.php;h=c38930da8bbaf12507a9d1b2d1e692e6edd916e2;hp=8b3c0977f5a42d63da651fa312eb6a6012680a1e;hb=HEAD;hpb=6986a39eb5c217a5d5345bfa079e51fc1cd1ea70

diff --git a/DataObjects/Core_email.php b/DataObjects/Core_email.php
index 8b3c0977..02ce3427 100644
--- a/DataObjects/Core_email.php
+++ b/DataObjects/Core_email.php
@@ -60,154 +60,6 @@ class Pman_Core_DataObjects_Core_email extends DB_DataObject
             )  AS bcc_group_member_count
         ");
 
-        $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 
-                    event_id > 0
-                AND 
-                    sent IS NOT NULL
-            )  
-            +
-            (
-                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 
-                    event_id > 0
-                AND 
-                    sent IS NOT NULL
-            ) 
-            AS sent_to_count
-        ");
-
-        $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 
-                    event_id > 0
-                AND 
-                    sent IS NOT NULL
-                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 
-                    event_id > 0
-                AND 
-                    sent IS NOT NULL
-                AND 
-                    is_open = 1
-            ) 
-            AS opened_by_count
-        ");
-
-        $this->selectAdd("
-        (
-            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'])) {
 	    $this->whereAddIn("!{$this->tableName()}.name", array('EVENT_ERRORS_REPORT'), 'string');
@@ -222,7 +74,7 @@ class Pman_Core_DataObjects_Core_email extends DB_DataObject
         $i->ontable = $this->tableName();
         $i->find();
         while ($i->fetch()){
-            $i->beforeDelete();
+            $i->beforeDelete(array(), $roo);
             $i->delete();
         }
     }
@@ -442,7 +294,7 @@ class Pman_Core_DataObjects_Core_email extends DB_DataObject
                 $html->item(0)->appendChild($element);
             }
             
-            $this->plaintext = str_replace("{unsubscribe_link}", $unsubscribe, $this->plaintext);
+            $this->plaintext = str_replace("{unsubscribe_link}", $unsubscribe, empty($this->plaintext) ? '' : $this->plaintext);
         }