#17854 - remove reset stats checkbox when more than a threshold have …

…been sent
phpList · Oct 5, 2015 · f1c7fa7 · f1c7fa7
1 parent ddd9d39
commit f1c7fa7
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/public_html/lists/admin/connect.php b/public_html/lists/admin/connect.php
@@ -331,9 +331,9 @@ function sendMessageStats($msgid) {
         $msg .= "\n".$item.' => '.$data[$item];
     }
     if ($stats_collection_address == 'phplist-stats@phplist.com' && $data["processed"] > 500) {
-      mail($stats_collection_address,"PHPlist stats",$msg);
+      mail($stats_collection_address,"phpList stats",$msg);
     } else {
-      mail($stats_collection_address,"PHPlist stats",$msg);
+      mail($stats_collection_address,"phpList stats",$msg);
     }
   }
 }

diff --git a/public_html/lists/admin/send_core.php b/public_html/lists/admin/send_core.php
@@ -949,13 +949,17 @@ function submitform() { document.sendmessageform.submit() }
      Help("googletrack").' '.s('add Google Analytics tracking code'),
      !empty($messagedata['google_track']) ? 'checked="checked"':'');
 
-  ## @@TODO, maybe add a check on "sent" for this campaign and suppress this once it's over a threshold
-  $send_content .= sprintf('
-    <div class="resetStatistics">
-    <label for"cb[resetstats]">%s</label><input type="hidden" name="cb[resetstats]" value="1" /><input type="checkbox" name="resetstats" id="resetstats" value="1" %s />
-    </div>',
-     Help("resetstats").' '.s('Reset click statistics'),
-     !empty($messagedata['resetstats']) ? 'checked="checked"':'');
+  $numsent = Sql_Fetch_Row_Query(sprintf('select count(*) from %s where messageid = %d',$GLOBALS['tables']['usermessage'],$messagedata['id']));
+  if ($numsent[0] < RESETSTATS_MAX) {
+      $send_content .= sprintf('
+        <div class="resetStatistics">
+        <label for"cb[resetstats]">%s</label><input type="hidden" name="cb[resetstats]" value="1" /><input type="checkbox" name="resetstats" id="resetstats" value="1" %s />
+        </div>',
+         Help("resetstats").' '.s('Reset click statistics'),
+         !empty($messagedata['resetstats']) ? 'checked="checked"':'');
+  } else {
+      $send_content .= '<input type="hidden" name="resetstats" value="0" />';
+  }
 
   $send_content .= sprintf('
     <div class="isTestCampaign">