When sending a campaign update the totals (sentashtml etc) only when sending is successful. (#848)

Author: bramley

public_html/lists/admin/sendemaillib.php

@@ -750,14 +750,13 @@ function sendEmail($messageid, $email, $hash, $htmlpref = 0, $rssitems = array()
         }
     }
 
+    $sentAs = '';
     // so what do we actually send?
     switch ($cached[$messageid]['sendformat']) {
         case 'PDF':
             // send a PDF file to users who want html and text to everyone else
             if ($htmlpref) {
-                if (!$isTestMail) {
-                    Sql_Query("update {$GLOBALS['tables']['message']} set aspdf = aspdf + 1 where id = $messageid");
-                }
+                $sentAs = 'aspdf';
                 $pdffile = createPdf($textmessage);
                 if (is_file($pdffile) && filesize($pdffile)) {
                     $fp = fopen($pdffile, 'r');
@@ -785,9 +784,7 @@ function sendEmail($messageid, $email, $hash, $htmlpref = 0, $rssitems = array()
                     return 0;
                 }
             } else {
-                if (!$isTestMail) {
-                    Sql_Query("update {$GLOBALS['tables']['message']} set astext = astext + 1 where id = $messageid");
-                }
+                $sentAs = 'astext';
                 $mail->add_text($textmessage);
                 if (!addAttachments($messageid, $mail, 'text',$hash)) {
                     return 0;
@@ -797,9 +794,7 @@ function sendEmail($messageid, $email, $hash, $htmlpref = 0, $rssitems = array()
         case 'text and PDF':
             // send a PDF file to users who want html and text to everyone else
             if ($htmlpref) {
-                if (!$isTestMail) {
-                    Sql_Query("update {$GLOBALS['tables']['message']} set astextandpdf = astextandpdf + 1 where id = $messageid");
-                }
+                $sentAs = 'astextandpdf';
                 $pdffile = createPdf($textmessage);
                 if (is_file($pdffile) && filesize($pdffile)) {
                     $fp = fopen($pdffile, 'r');
@@ -827,9 +822,7 @@ function sendEmail($messageid, $email, $hash, $htmlpref = 0, $rssitems = array()
                     return 0;
                 }
             } else {
-                if (!$isTestMail) {
-                    Sql_Query("update {$GLOBALS['tables']['message']} set astext = astext + 1 where id = $messageid");
-                }
+                $sentAs = 'astext';
                 $mail->add_text($textmessage);
                 if (!addAttachments($messageid, $mail, 'text',$hash)) {
                     return 0;
@@ -838,9 +831,7 @@ function sendEmail($messageid, $email, $hash, $htmlpref = 0, $rssitems = array()
             break;
         case 'text':
             // send as text
-            if (!$isTestMail) {
-                Sql_Query("update {$GLOBALS['tables']['message']} set astext = astext + 1 where id = $messageid");
-            }
+            $sentAs = 'astext';
             $mail->add_text($textmessage);
             if (!addAttachments($messageid, $mail, 'text',$hash)) {
                 return 0;
@@ -863,9 +854,7 @@ function sendEmail($messageid, $email, $hash, $htmlpref = 0, $rssitems = array()
             if (!$handled_by_plugin) {
                 // send one big file to users who want html and text to everyone else
                 if ($htmlpref) {
-                    if (!$isTestMail) {
-                        Sql_Query("update {$GLOBALS['tables']['message']} set astextandhtml = astextandhtml + 1 where id = $messageid");
-                    }
+                    $sentAs = 'astextandhtml';
                     //  dbg("Adding HTML ".$cached[$messageid]["templateid"]);
                     if (WORDWRAP_HTML) {
                         //# wrap it: http://mantis.phplist.com/view.php?id=15528
@@ -879,9 +868,7 @@ function sendEmail($messageid, $email, $hash, $htmlpref = 0, $rssitems = array()
                         return 0;
                     }
                 } else {
-                    if (!$isTestMail) {
-                        Sql_Query("update {$GLOBALS['tables']['message']} set astext = astext + 1 where id = $messageid");
-                    }
+                    $sentAs = 'astext';
                     $mail->add_text($textmessage);
 //          $mail->setText($textmessage);
 //          $mail->Encoding = TEXTEMAIL_ENCODING;
@@ -931,6 +918,11 @@ function sendEmail($messageid, $email, $hash, $htmlpref = 0, $rssitems = array()
                 $messageid, $counters['batch_count'], $counters['batch_total'], $email, $destinationemail), 0);
         } else {
             $sendOK = true;
+
+            if (!$isTestMail && $sentAs != '') {
+                Sql_Query("update {$GLOBALS['tables']['message']} set $sentAs = $sentAs + 1 where id = $messageid");
+            }
+
             foreach ($GLOBALS['plugins'] as $pluginname => $plugin) {
                 $plugin->processSendSuccess($messageid, $userdata, $isTestMail);
             }