Added support for favicon.ico/gif/png in base path (very basic support)

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

diff --git a/inc/mails/beg_mails.php b/inc/mails/beg_mails.php
index db78e472b640c4bb15c20e2c1db0c1fc7d6731c9..ea429a5a366bb5eedb211c37b36aa6bb2b58fde0 100644 (file)
--- a/inc/mails/beg_mails.php
+++ b/inc/mails/beg_mails.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -39,23 +39,24 @@
 if (!defined('__SECURITY')) {
        die();
 } elseif ((!isExtensionActive('beg')) || (isExtensionInstalledAndOlder('beg', '0.2.8'))) {
+       // Do not execute script on missing/out-dated extension ext-beg
+       return;
+} elseif (!isHtmlOutputMode()) {
+       // Do not execute script if not in HTML mode
        return;
 }
 
-// Do not execute when script is in CSS mode
-if (!isHtmlOutputMode()) return;
-
 // Create timemark from saved month
-$mark = mktime(0, 0, 0, getLastMonth(), getDay(), getYear());
+$mark = mktime(0, 0, 0, getLastMonthly(), getDay(), getYear());
 $sql = ''; $mode = '';
 
 // Shall I sent activation or deactivation mail?
-$sql = "SELECT `userid`,`email` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE (`beg_rallye_enable_notify` ";
+$sql = "SELECT `d`.`userid`, `d`.`email` FROM `{?_MYSQL_PREFIX?}_user_data` AS `d` WHERE (`d`.`beg_rallye_enable_notify` ";
 switch (getBegRallye()) {
        case 'Y': // Begging rallye is activated
                if (isBegRallyeEnableNotifyEnabled()) {
                        // Okay, let's check for member accounts
-                       $sql .= '= 0 OR (`beg_rallye_enable_notify` > 0 AND `beg_rallye_enable_notify` < `beg_rallye_disable_notify`)';
+                       $sql .= '= 0 OR (`d`.`beg_rallye_enable_notify` > 0 AND `d`.`beg_rallye_enable_notify` < `d`.`beg_rallye_disable_notify`)';
                        $mode = 'enable';
                } else {
                        // Do not notify!
@@ -66,7 +67,7 @@ switch (getBegRallye()) {
        case 'N': // Begging rallye is deactivated
                if (isBegRallyeDisableNotifyEnabled()) {
                        // Okay, let's check for member accounts
-                       $sql .= ' > 0 AND `beg_rallye_disable_notify` < `beg_rallye_enable_notify`';
+                       $sql .= ' > 0 AND `d`.`beg_rallye_disable_notify` < `d`.`beg_rallye_enable_notify`';
                        $mode = 'disable';
                } else {
                        // Do not notify!
@@ -76,8 +77,18 @@ switch (getBegRallye()) {
 } // END - switch
 
 if (!empty($sql)) {
+       // 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
+
        // The SQL command needs to be finisched here (only confirmed accounts!)
-       $sql .= ") AND `status`='CONFIRMED' ORDER BY `last_online` ASC";
+       $sql .= ')' . $whereStatement . runFilterChain('user_exclusion_sql', " AND `d`.`status`='CONFIRMED'") . ' ORDER BY `d`.`last_online` ASC';
 
        // No IP locking setuped by default
        $content['ip_locker'] = '{--BEG_NO_LIMITATION--}';
@@ -116,9 +127,9 @@ LIMIT 1",
                                ), __FILE__, __LINE__);
 
                        // Load email template and send it to the user!
-                       if ($sentBonusMails === true) {
+                       if ($sentBonusMails === TRUE) {
                                // Add userid to queue
-                               $userids[] = $content['userid'];
+                               array_push($userids, $content['userid']);
                        } else {
                                // Send normal notification mail to the members
                                $message = loadEmailTemplate('beg_' . $mode . '_notify', $content, $content['userid']);
@@ -127,7 +138,7 @@ LIMIT 1",
                } // END - while
 
                // Shall I send out bonus mails?
-               if ($sentBonusMails === true) {
+               if ($sentBonusMails === TRUE) {
                        // Okay, make array to string
                        $receiver = implode(';', $userids);