Mailer project continued:

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

diff --git a/inc/mails/beg_mails.php b/inc/mails/beg_mails.php
index 9cc3453a72cd3ac56515746ce7abec1ccea67329..902997e72954985f496c63b83d8f25708e7af677 100644 (file)
--- a/inc/mails/beg_mails.php
+++ b/inc/mails/beg_mails.php
@@ -16,8 +16,8 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * 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 *
  * it under the terms of the GNU General Public License as published by *
@@ -39,18 +39,19 @@
 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());
 $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 `userid`, `email` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE (`beg_rallye_enable_notify` ";
 switch (getBegRallye()) {
        case 'Y': // Begging rallye is activated
                if (isBegRallyeEnableNotifyEnabled()) {
@@ -77,7 +78,7 @@ switch (getBegRallye()) {
 
 if (!empty($sql)) {
        // The SQL command needs to be finisched here (only confirmed accounts!)
-       $sql .= ") AND `status`='CONFIRMED' ORDER BY `last_online` ASC";
+       $sql .= ')' . runFilterChain('user_exclusion_sql', " AND `status`='CONFIRMED'") . ' ORDER BY `last_online` ASC';
 
        // No IP locking setuped by default
        $content['ip_locker'] = '{--BEG_NO_LIMITATION--}';
@@ -118,7 +119,7 @@ LIMIT 1",
                        // Load email template and send it to the user!
                        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']);