First batch of removal of the headers needed for revision-functions.php

[mailer.git] / inc / mails / doubler_mails.php

diff --git a/inc/mails/doubler_mails.php b/inc/mails/doubler_mails.php
index 1dc41a242a00b75fc56110ee52dc1258dce7d89d..32d57d36c7356181c74adace6213d5e8a0cf76de 100644 (file)
--- a/inc/mails/doubler_mails.php
+++ b/inc/mails/doubler_mails.php
@@ -10,13 +10,8 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Sendet Mails bei vergueteter Verdoppelung aus    *
  * -------------------------------------------------------------------- *
- * $Revision::                                                        $ *
- * $Date::                                                            $ *
- * $Tag:: 0.2.1-FINAL                                                 $ *
- * $Author::                                                          $ *
- * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -58,7 +53,7 @@ if (isExtensionActive('jackpot')) {
 // Get total points of the doubler itself
 $totalPoints = getDoublerTotalPointsLeft();
 if ($totalPoints == '0') {
-       // Exit here to prevent some SQL errors (SQL_QUERY_ESC doen't insert zeros! We need to fix this...)
+       // Exit here to prevent some SQL errors (sqlQueryEscaped doen't insert zeros! We need to fix this...)
        return;
 } // END - if
 
@@ -68,18 +63,8 @@ unsetPostRequestElement('DOUBLER_USERID');
 setSession('DOUBLER_USERID', '');
 if (empty($GLOBALS['local_doubler_userid'])) $GLOBALS['local_doubler_userid'] = '0';
 
-// Init additional WHERE statement
-$whereStatement = ' ';
-
-// Is ext-holiday installed?
-// @TODO Rewrite these if() blocks to a filter
-if (isExtensionActive('holiday')) {
-       // Exclude those as well
-       $whereStatement .= " AND `d`.`holiday_active`='N'";
-} // END - if
-
 // Check for doubles which we can pay out
-$result_total = SQL_QUERY_ESC("SELECT
+$result_total = sqlQueryEscaped("SELECT
        COUNT(`do`.`id`) AS `cnt`,
 FROM
        `{?_MYSQL_PREFIX?}_doubler` AS `do`
@@ -89,7 +74,7 @@ ON
        `do`.`userid`=`d`.`userid`
 WHERE
        `d`.`status`='CONFIRMED'
-       " . runFilterChain('user_exclusion_sql', $whereStatement) . " AND
+       " . runFilterChain('user_exclusion_sql', ' ' . $whereStatement) . " AND
        `do`.`points` <= %s AND
        `do`.`points` >= ({?doubler_min?} * 2) AND
        `do`.`completed`='N' AND
@@ -101,13 +86,13 @@ ORDER BY
        ), __FILE__, __LINE__);
 
 // Get total count
-list($totalCount) = SQL_FETCHROW($result_total);
+list($totalCount) = sqlFetchRow($result_total);
 
 // Free memory
-SQL_FREERESULT($result_total);
+sqlFreeResult($result_total);
 
 // Check for accounts with limitation
-$result_main = SQL_QUERY_ESC("SELECT
+$result_main = sqlQueryEscaped("SELECT
        `do`.`id`,
        `do`.`userid`,
        `do`.`points`,
@@ -121,7 +106,7 @@ ON
        `do`.`userid`=`d`.`userid`
 WHERE
        `d`.`status`='CONFIRMED'
-       " . runFilterChain('user_exclusion_sql', $whereStatement) . " AND
+       " . runFilterChain('user_exclusion_sql', ' ' . $whereStatement) . " AND
        `do`.`points` <= %s AND
        `do`.`points` >= ({?doubler_min?} * 2) AND
        `do`.`completed`='N' AND
@@ -134,7 +119,7 @@ LIMIT {?doubler_max_sent?}",
        ), __FILE__, __LINE__);
 
 // Are there entries found?
-if ((($totalCount > 0) && (getConfig('doubler_sent_all') == 'Y')) || ((SQL_NUMROWS($result_main) == getConfig('doubler_group_sent')) && (getConfig('doubler_sent_all') != 'Y'))) {
+if ((($totalCount > 0) && (getConfig('doubler_sent_all') == 'Y')) || ((sqlNumRows($result_main) == getConfig('doubler_group_sent')) && (getConfig('doubler_sent_all') != 'Y'))) {
        // Switch to matching SQL resource
        $result_load = $result_main;
        if (($totalCount > 0) && (getConfig('doubler_sent_all') == 'Y')) {
@@ -142,7 +127,7 @@ if ((($totalCount > 0) && (getConfig('doubler_sent_all') == 'Y')) || ((SQL_NUMRO
        } // END - if
 
        // At least one account was found
-       while ($content = SQL_FETCHARRAY($result_load)) {
+       while ($content = sqlFetchArray($result_load)) {
                // Only double when points are enougth!
                if ($totalPoints >= $content['points']) {
                        // Check for his ref points
@@ -156,7 +141,7 @@ if ((($totalCount > 0) && (getConfig('doubler_sent_all') == 'Y')) || ((SQL_NUMRO
                        if (($refPoints > 0) && ($GLOBALS['local_doubler_userid'] == $content['userid']) && (!empty($refPoints))) {
                                // Referral points found so add them and set line(s) to completed='Y'
                                $content['points'] += $refPoints;
-                               SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_doubler` SET `completed`='Y' WHERE `refid`=%s AND `completed`='N' AND `is_ref`='Y'",
+                               sqlQueryEscaped("UPDATE `{?_MYSQL_PREFIX?}_doubler` SET `completed`='Y' WHERE `refid`=%s AND `completed`='N' AND `is_ref`='Y'",
                                        array(bigintval($content['userid'])), __FILE__, __LINE__);
                        } else {
                                // No referral points found
@@ -167,11 +152,11 @@ if ((($totalCount > 0) && (getConfig('doubler_sent_all') == 'Y')) || ((SQL_NUMRO
                        if ($content['userid'] != getDoublerUserid()) {
                                // Add points
                                initReferralSystem();
-                               addPointsThroughReferralSystem(sprintf("doubler_%s", strtolower(getDoublerSendMode())), $content['userid'], $content['points']);
+                               addPointsThroughReferralSystem(sprintf('doubler_%s', strtolower(getDoublerSendMode())), $content['userid'], $content['points']);
                        } // END - if
 
                        // Set entry as "payed"
-                       SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_doubler` SET `completed`='Y' WHERE `id`=%s LIMIT 1",
+                       sqlQueryEscaped("UPDATE `{?_MYSQL_PREFIX?}_doubler` SET `completed`='Y' WHERE `id`=%s LIMIT 1",
                                array(bigintval($content['id'])), __FILE__, __LINE__);
 
                        $okay = FALSE;
@@ -184,7 +169,7 @@ if ((($totalCount > 0) && (getConfig('doubler_sent_all') == 'Y')) || ((SQL_NUMRO
                        } // END - if
 
                        // Exclude also webmaster's id in taking points from webmaster's account
-                       if (($userPoints > 0) && ($userPoints >= $content['points']) && ($okay === FALSE) && (getDoublerUserid() > 0) && ($content['userid'] != getDoublerUserid())) {
+                       if (($userPoints > 0) && ($userPoints >= $content['points']) && ($okay === FALSE) && (isValidId(getDoublerUserid())) && ($content['userid'] != getDoublerUserid())) {
                                // Subtract points
                                $okay = subtractPoints('doubler_payout', getDoublerUserid(), $content['points']);
                        } // END - if
@@ -210,8 +195,8 @@ if ((($totalCount > 0) && (getConfig('doubler_sent_all') == 'Y')) || ((SQL_NUMRO
 } // END - if
 
 // Free memory
-SQL_FREERESULT($result_total);
-SQL_FREERESULT($result_main);
+sqlFreeResult($result_total);
+sqlFreeResult($result_main);
 
 // [EOF]
 ?>