New wrapper functions introduced

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

diff --git a/inc/mails/doubler_mails.php b/inc/mails/doubler_mails.php
index a26123480ed695eff3aed8643817a87948e9441f..85d852979a940eb045b7a93c1ff497b9872c6c8f 100644 (file)
--- a/inc/mails/doubler_mails.php
+++ b/inc/mails/doubler_mails.php
@@ -45,7 +45,7 @@ if (!defined('__SECURITY')) {
 }
 
 // Do not execute when script is in CSS mode
-if (getOutputMode() != 0) return;
+if (!isHtmlOutputMode()) return;
 
 // Initialize variables
 $jackpotPoints = '0'; $userPoints = '0';
@@ -62,7 +62,7 @@ if ($DOUBLER_POINTS == '0') {
 unsetGetRequestParameter('DOUBLER_UID');
 unsetPostRequestParameter('DOUBLER_UID');
 setSession('DOUBLER_UID', '');
-if (empty($GLOBALS['doubler_userid'])) $GLOBALS['doubler_userid'] = '0';
+if (empty($GLOBALS['local_doubler_userid'])) $GLOBALS['local_doubler_userid'] = '0';
 
 // Check for doubles which we can pay out
 $result_total = SQL_QUERY_ESC("SELECT
@@ -123,7 +123,7 @@ if (((SQL_NUMROWS($result_total) > 0) && (getConfig('doubler_sent_all') == 'Y'))
                        // Zero refid when empty (might be helpful!)
                        if (empty($ref)) $ref = '0';
 
-                       if (($ref > 0) && ($GLOBALS['doubler_userid'] == $content['userid']) && (!empty($ref))) {
+                       if (($ref > 0) && ($GLOBALS['local_doubler_userid'] == $content['userid']) && (!empty($ref))) {
                                // Referal points found so add them and set line(s) to completed='Y'
                                $content['points'] += $ref;
                                SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_doubler` SET `completed`='Y' WHERE `refid`=%s AND `completed`='N' AND `is_ref`='Y'",
@@ -175,20 +175,11 @@ if (((SQL_NUMROWS($result_total) > 0) && (getConfig('doubler_sent_all') == 'Y'))
                        $DOUBLER_POINTS -= $content['points'];
 
                        // Prepare array
-                       $content = array(
-                               // Doubler transmission id
-                               'id'        => $content['id'],
-                               // Doubled points
-                               'points'    => $content['points'],
-                               // Timemark
-                               'timemark'  => generateDateTime($content['timemark'], 2),
-                               // IP number when the member submitted the doubling form
-                               'remote_ip' => $content['remote_ip'],
-                       );
+                       $content['timemark'] = generateDateTime($content['timemark'], 2);
 
                        // Load mail template and send mail away...
                        $message = loadEmailTemplate('member_doubler', $content, $content['userid']);
-                       sendEmail($content['userid'], getMessage('DOUBLER_MEMBER_SUBJECT'), $message);
+                       sendEmail($content['userid'], '{--DOUBLER_MEMBER_SUBJECT--}', $message);
                } // END - if
        } // END - while
 } // END - if