Merge pull request #615 from bramley/display_campaign_title

Display campaign title and bounce time on Subscriber Profile campaigns tab

Author: suelaP

public_html/lists/admin/actions/campaigns.php

@@ -23,9 +23,23 @@
 
 $ls = new WebblerListing(s('Campaigns'));
 if (Sql_Table_Exists($GLOBALS['tables']['usermessage'])) {
-    $msgs = Sql_Query(sprintf('select messageid,entered,viewed,(viewed = 0 or viewed is null) as notviewed,
-abs(unix_timestamp(entered) - unix_timestamp(viewed)) as responsetime from %s where userid = %d and status = "sent" order by entered desc',
-        $GLOBALS['tables']['usermessage'], $user['id']));
+    $msgs = Sql_Query(sprintf(
+        'select messageid,
+            entered,
+            viewed,
+            (viewed = 0 or viewed is null) as notviewed,
+            abs(unix_timestamp(entered) - unix_timestamp(viewed)) as responsetime,
+            (select max(time)
+                from %s umb
+                where umb.message = messageid and umb.user = userid
+            ) as bouncetime
+            from %s
+            where userid = %d and status = "sent"
+            order by entered desc',
+        $GLOBALS['tables']['user_message_bounce'],
+        $GLOBALS['tables']['usermessage'],
+        $user['id']
+    ));
     $num = Sql_Affected_Rows();
 } else {
     $num = 0;
@@ -34,32 +48,39 @@
 if ($num) {
     $resptime = 0;
     $totalresp = 0;
-    $ls->setElementHeading(s('Campaign Id'));
+    $ls->setElementHeading(s('Campaign'));
 
     while ($msg = Sql_Fetch_Array($msgs)) {
-        $ls->addElement($msg['messageid'],
-            PageURL2('message', s('view'), 'id='.$msg['messageid']));
+        $element = sprintf('<!--%d--> %s', $msg['messageid'],  campaignTitle($msg['messageid']));
+        $ls->addElement($element, PageURL2('message', s('view'), 'id='.$msg['messageid']));
+
         if (defined('CLICKTRACK') && CLICKTRACK) {
             $clicksreq = Sql_Fetch_Row_Query(sprintf('select sum(clicked) as numclicks from %s where userid = %s and messageid = %s',
                 $GLOBALS['tables']['linktrack_uml_click'], $user['id'], $msg['messageid']));
             $clicks = sprintf('%d', $clicksreq[0]);
             if ($clicks) {
-                $ls->addColumn($msg['messageid'], s('clicks'),
+                $ls->addColumn($element, s('clicks'),
                     PageLink2('userclicks&amp;userid='.$user['id'].'&amp;msgid='.$msg['messageid'], $clicks));
             } else {
-                $ls->addColumn($msg['messageid'], s('clicks'), 0);
+                $ls->addColumn($element, s('clicks'), 0);
             }
         }
 
-        $ls->addColumn($msg['messageid'], s('sent'), formatDateTime($msg['entered'], 1));
+        $ls->addColumn($element, s('sent'), formatDateTime($msg['entered'], 1));
         if (!$msg['notviewed']) {
-            $ls->addColumn($msg['messageid'], s('viewed'), formatDateTime($msg['viewed'], 1));
-            $ls->addColumn($msg['messageid'], s('Response time'), secs2time($msg['responsetime']));
+            $viewed = formatDateTime($msg['viewed'], 1);
+            $responseTime = secs2time($msg['responsetime']);
             $resptime += $msg['responsetime'];
             $totalresp += 1;
+        } else {
+            $viewed = '';
+            $responseTime = '';
         }
-        if (!empty($bounces[$msg['messageid']])) {
-            $ls->addColumn($msg['messageid'], s('bounce'), $bounces[$msg['messageid']]);
+        $ls->addColumn($element, s('viewed'), $viewed);
+        $ls->addColumn($element, s('Response time'), $responseTime);
+
+        if ($msg['bouncetime']) {
+            $ls->addColumn($element, s('bounce'), formatDateTime($msg['bouncetime'], 1));
         }
     }
     if ($totalresp) {