Updated copyright year.

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

diff --git a/inc/mails/beg_mails.php b/inc/mails/beg_mails.php
index a773063f8e15132753a5a066fb503edc679888ec..58fae33f77bf0cf589351da5ddc6685a92ac368b 100644 (file)
--- a/inc/mails/beg_mails.php
+++ b/inc/mails/beg_mails.php
@@ -10,13 +10,8 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Versendet Erinnerungsmails                       *
  * -------------------------------------------------------------------- *
- * $Revision::                                                        $ *
- * $Date::                                                            $ *
- * $Tag:: 0.2.1-FINAL                                                 $ *
- * $Author::                                                          $ *
- * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2016 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -77,18 +72,8 @@ 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 .= ')' . $whereStatement . runFilterChain('user_exclusion_sql', " AND `d`.`status`='CONFIRMED'") . ' ORDER BY `d`.`last_online` ASC';
+       $sql .= ')' . 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--}';
@@ -100,7 +85,8 @@ if (!empty($sql)) {
 
        // Check for accounts to be notified
        $result_main = sqlQuery($sql, __FILE__, __LINE__);
-       if (!ifSqlHasZeroNums($result_main)) {
+
+       if (!ifSqlHasZeroNumRows($result_main)) {
                // Normal notification mails or bonus mails?
                $sentBonusMails = ((getBegNotifyBonus() > 0) && ($mode == 'enable') && (isExtensionActive('bonus')));