More fixes for typos in SQL queries

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

diff --git a/inc/mails/beg_mails.php b/inc/mails/beg_mails.php
index b9a65e462f446f22abd062ef175723a3f375a6a2..936bbc8b44c12e1675074bbc69cbc58a8e2f545a 100644 (file)
--- a/inc/mails/beg_mails.php
+++ b/inc/mails/beg_mails.php
@@ -40,25 +40,25 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
        die();
-} elseif (!isExtensionActive('beg')) {
+} elseif ((!isExtensionActive('beg')) || (isExtensionInstalledAndOlder('beg', '0.2.8'))) {
        return;
 }
 
 // Do not execute when script is in CSS mode
-if (getOutputMode() != 0) return;
+if (getScriptOutputMode() != 0) return;
 
 // Create timemark from saved month
-$mark = mktime(0, 0, 0, getConfig('last_month'), date('d', time()), date('Y', time()));
+$mark = mktime(0, 0, 0, getConfig('last_month'), getDay(), getYear());
 $sql = ''; $mode = '';
 
 // Shall I sent activation or deactivation mail?
-$sql = "SELECT `userid`, `email` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE (`beg_ral_notify` ";
+$sql = "SELECT `userid`, `email` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE (`beg_rallye_enable_notify` ";
 switch (getConfig('beg_rallye')) {
        case 'Y': // Begging rallye is activated
-               if (getConfig('beg_ral_en_notify') == 'Y') {
+               if (getConfig('beg_rallye_enable_notify') == 'Y') {
                        // Okay, let's check for member accounts
-                       $sql .= '= 0 OR (`beg_ral_notify` > 0 AND `beg_ral_en_notify` < `beg_ral_di_notify`)';
-                       $mode = 'en';
+                       $sql .= '= 0 OR (`beg_rallye_enable_notify` > 0 AND `beg_rallye_enable_notify` < `beg_rallye_disable_notify`)';
+                       $mode = 'enable';
                } else {
                        // Do not notify!
                        $sql = '';
@@ -66,10 +66,10 @@ switch (getConfig('beg_rallye')) {
                break;
 
        case 'N': // Begging rallye is deactivated
-               if (getConfig('beg_ral_di_notify') == 'Y') {
+               if (getConfig('beg_rallye_disable_notify') == 'Y') {
                        // Okay, let's check for member accounts
-                       $sql .= ' > 0 AND `beg_ral_di_notify` < `beg_ral_en_notify`';
-                       $mode = 'di';
+                       $sql .= ' > 0 AND `beg_rallye_disable_notify` < `beg_rallye_enable_notify`';
+                       $mode = 'disable';
                } else {
                        // Do not notify!
                        $sql = '';
@@ -82,7 +82,7 @@ if (!empty($sql)) {
        $sql .= ") AND `status`='CONFIRMED' ORDER BY `last_online` ASC";
 
        // No IP locking setuped by default
-       $content['ip_locker'] = getMessage('BEG_NO_LIMITATION');
+       $content['ip_locker'] = '{--BEG_NO_LIMITATION--}';
 
        if (getConfig('beg_ip_timeout') > 0) {
                // Create timemark
@@ -91,15 +91,15 @@ if (!empty($sql)) {
 
        // Check for accounts to be notified
        $result_main = SQL_QUERY($sql, __FILE__, __LINE__);
-       if (SQL_NUMROWS($result_main) > 0) {
+       if (!SQL_HASZERONUMS($result_main)) {
                // Normal notification mails or bonus mails?
-               $sentBonusMails = ((getConfig('beg_notify_bonus') > 0) && ($mode == "en") && (isExtensionActive('bonus')));
+               $sentBonusMails = ((getConfig('beg_notify_bonus') > 0) && ($mode == 'enable') && (isExtensionActive('bonus')));
 
                // Generate subject line
-               $subject = getMessage('BEG_RALLYE_'.strtoupper($mode).'_NOTIFY');
+               $subject = '{--BEG_RALLYE_' . strtoupper($mode) . '_NOTIFY--}';
 
                // Load message body for bonus mails
-               $message = loadEmailTemplate('beg_en_notify_body', '', '{PER}userid{PER}');
+               $message = loadEmailTemplate('beg_enable_notify_body', '', '{PER}userid{PER}');
                $receiver = ''; $userids = array();
 
                // Okay lets notify all users!
@@ -111,8 +111,7 @@ if (!empty($sql)) {
                        SQL_QUERY_ESC("UPDATE
        `{?_MYSQL_PREFIX?}_user_data`
 SET
-       `beg_ral_notify`=UNIX_TIMESTAMP(),
-       `beg_ral_%s_notify`=UNIX_TIMESTAMP()
+       `beg_rallye_%s_notify`=UNIX_TIMESTAMP()
 WHERE
        `userid`=%s
 LIMIT 1",
@@ -138,10 +137,10 @@ LIMIT 1",
                        $receiver = implode(';', $userids);
 
                        // Prepare URL
-                       $URL = 'modules.php?module=index&amp;what=login';
+                       $url = 'modules.php?module=index&amp;what=login';
 
                        // Insert mail
-                       addBonusMailToQueue($subject, $message, $receiver, getConfig('beg_notify_bonus'), getConfig('beg_notify_wait'), $URL, 0, 'normal', SQL_NUMROWS($result_main));
+                       addBonusMailToQueue($subject, $message, $receiver, getConfig('beg_notify_bonus'), getConfig('beg_notify_wait'), $url, 0, 'normal', SQL_NUMROWS($result_main));
                } // END - if
        } // END - if