X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmails%2Fdoubler_mails.php;h=91f3988d91f3b71b8da61fc987eb956c184dfda5;hb=e17685c65d1a48c061b7c4f64c7a23c165430460;hp=0c400f7780d1403d5d935a97dfa93110ad820f69;hpb=c8d76610eb94093d4eed4fcd8a6cb72e74c8f6d8;p=mailer.git

diff --git a/inc/mails/doubler_mails.php b/inc/mails/doubler_mails.php
index 0c400f7780..91f3988d91 100644
--- a/inc/mails/doubler_mails.php
+++ b/inc/mails/doubler_mails.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -39,15 +39,21 @@
 if (!defined('__SECURITY')) {
 	die();
 } elseif (!isExtensionActive('doubler')) {
+	// Do not execute when extension is absent
+	return;
+} elseif (!isHtmlOutputMode()) {
+	// Do not execute when script is in CSS mode
 	return;
 }
 
-// Do not execute when script is in CSS mode
-if (!isHtmlOutputMode()) return;
-
 // Initialize variables
-$jackpotPoints = '0'; $userPoints = '0';
-if (isExtensionActive('jackpot')) $jackpotPoints = getJackpotPoints();
+$jackpotPoints = '0';
+$userPoints = '0';
+
+// @TODO Can this be rewritten to a filter?
+if (isExtensionActive('jackpot')) {
+	$jackpotPoints = getJackpotPoints();
+} // END - if
 
 // Get total points of the doubler itself
 $DOUBLER_POINTS = getDoublerTotalPointsLeft();
@@ -106,10 +112,12 @@ LIMIT {?doubler_max_sent?}",
 	), __FILE__, __LINE__);
 
 // Do we have entries found?
-if (((SQL_NUMROWS($result_total) > 0) && (getConfig('doubler_sent_all') == 'Y')) || ((SQL_NUMROWS($result_main) == getConfig('doubler_group_sent')) && (getConfig('doubler_sent_all') != 'Y'))) {
+if (((!SQL_HASZERONUMS($result_total)) && (getConfig('doubler_sent_all') == 'Y')) || ((SQL_NUMROWS($result_main) == getConfig('doubler_group_sent')) && (getConfig('doubler_sent_all') != 'Y'))) {
 	// Switch to matching SQL resource
 	$result_load = $result_main;
-	if ((SQL_NUMROWS($result_total) > 0) && (getConfig('doubler_sent_all') == 'Y')) $result_load = $result_total;
+	if ((!SQL_HASZERONUMS($result_total)) && (getConfig('doubler_sent_all') == 'Y')) {
+		$result_load = $result_total;
+	} // END - if
 
 	// At least one account was found
 	while ($content = SQL_FETCHARRAY($result_load)) {