A lot more wrapper functions introduced, TODOs.txt updated

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

diff --git a/inc/mails/beg_mails.php b/inc/mails/beg_mails.php
index 148404fff0e5cd8be5618739d440663a18a9294b..4fcb702cbd5a40119eb0128ac0543524abb04f66 100644 (file)
--- a/inc/mails/beg_mails.php
+++ b/inc/mails/beg_mails.php
@@ -14,8 +14,6 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
@@ -45,19 +43,19 @@ if (!defined('__SECURITY')) {
 }
 
 // Do not execute when script is in CSS mode
-if (getOutputMode() != 0) return;
+if (!isHtmlOutputMode()) return;
 
 // Create timemark from saved month
-$mark = mktime(0, 0, 0, getConfig('last_month'), getDay(), getYear());
+$mark = mktime(0, 0, 0, getLastMonth(), getDay(), getYear());
 $sql = ''; $mode = '';
 
 // Shall I sent activation or deactivation mail?
-$sql = "SELECT `userid`, `email` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE (`beg_rallye_notify` ";
-switch (getConfig('beg_rallye')) {
+$sql = "SELECT `userid`, `email` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE (`beg_rallye_enable_notify` ";
+switch (getBegRallye()) {
        case 'Y': // Begging rallye is activated
-               if (getConfig('beg_rallye_enable_notify') == 'Y') {
+               if (isBegRallyeEnableNotifyEnabled()) {
                        // Okay, let's check for member accounts
-                       $sql .= '= 0 OR (`beg_rallye_notify` > 0 AND `beg_rallye_enable_notify` < `beg_rallye_disable_notify`)';
+                       $sql .= '= 0 OR (`beg_rallye_enable_notify` > 0 AND `beg_rallye_enable_notify` < `beg_rallye_disable_notify`)';
                        $mode = 'enable';
                } else {
                        // Do not notify!
@@ -66,7 +64,7 @@ switch (getConfig('beg_rallye')) {
                break;
 
        case 'N': // Begging rallye is deactivated
-               if (getConfig('beg_rallye_disable_notify') == 'Y') {
+               if (isBegRallyeDisableNotifyEnabled()) {
                        // Okay, let's check for member accounts
                        $sql .= ' > 0 AND `beg_rallye_disable_notify` < `beg_rallye_enable_notify`';
                        $mode = 'disable';
@@ -84,19 +82,16 @@ if (!empty($sql)) {
        // No IP locking setuped by default
        $content['ip_locker'] = '{--BEG_NO_LIMITATION--}';
 
-       if (getConfig('beg_ip_timeout') > 0) {
+       if (getBegIpTimeout() > 0) {
                // Create timemark
-               $content['ip_locker'] = createFancyTime(getConfig('beg_ip_timeout'));
+               $content['ip_locker'] = '{%config,createFancyTime=beg_ip_timeout%}';
        } // END - if
 
        // 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 == 'enable') && (isExtensionActive('bonus')));
-
-               // Generate subject line
-               $subject = '{--BEG_RALLYE_' . strtoupper($mode) . '_NOTIFY--}';
+               $sentBonusMails = ((getBegNotifyBonus() > 0) && ($mode == 'enable') && (isExtensionActive('bonus')));
 
                // Load message body for bonus mails
                $message = loadEmailTemplate('beg_enable_notify_body', '', '{PER}userid{PER}');
@@ -111,7 +106,6 @@ if (!empty($sql)) {
                        SQL_QUERY_ESC("UPDATE
        `{?_MYSQL_PREFIX?}_user_data`
 SET
-       `beg_rallye_notify`=UNIX_TIMESTAMP(),
        `beg_rallye_%s_notify`=UNIX_TIMESTAMP()
 WHERE
        `userid`=%s
@@ -128,7 +122,7 @@ LIMIT 1",
                        } else {
                                // Send normal notification mail to the members
                                $message = loadEmailTemplate('beg_' . $mode . '_notify', $content, $content['userid']);
-                               sendEmail($content['email'], $subject, $message);
+                               sendEmail($content['email'], '{--BEG_RALLYE_' . strtoupper($mode) . '_SUBJECT--}', $message);
                        }
                } // END - while
 
@@ -141,7 +135,7 @@ LIMIT 1",
                        $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('{--BEG_RALLYE_' . strtoupper($mode) . '_SUBJECT--}', $message, $receiver, getBegNotifyBonus(), getBegNotifyWait(), $url, 0, 'normal', SQL_NUMROWS($result_main));
                } // END - if
        } // END - if