Renamed ifSqlHasZeroNums() to ifSqlHasZeroNumRows() and improved some queries.

[mailer.git] / inc / daily / daily_holiday.php

diff --git a/inc/daily/daily_holiday.php b/inc/daily/daily_holiday.php
index 9fad7691ad2a8073ef54fd4ad353a91f5fa5d183..10a7253bb7a975ca5bf1428d50801fe6d430dee3 100644 (file)
--- a/inc/daily/daily_holiday.php
+++ b/inc/daily/daily_holiday.php
@@ -10,13 +10,8 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Dinge, die beim taeglichen Reset erledigt werden *
  * -------------------------------------------------------------------- *
- * $Revision::                                                        $ *
- * $Date::                                                            $ *
- * $Tag:: 0.2.1-FINAL                                                 $ *
- * $Author::                                                          $ *
- * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2015 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -38,11 +33,11 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
        die();
-} elseif ((!isHtmlOutputMode()) || ((!isResetModeEnabled()) && (getConfig('holiday_mode') == 'RESET'))) {
-       // Do not execute when script is in CSS mode or no daily reset
+} elseif ((!isHtmlOutputMode()) || ((!isDailyResetEnabled()) && (getConfig('holiday_mode') == 'RESET'))) {
+       // Do not execute when script is in non-HTML mode or no daily reset
        return;
 } elseif (!isExtensionActive('holiday')) {
-       logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension disabled.');
+       if (isDebugModeEnabled()) logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension ext-holiday disabled.');
        return;
 }
 
@@ -50,8 +45,9 @@ if (!defined('__SECURITY')) {
 //* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Daily reset started.');
 
 // Check for holidays we need to enable and send email to user
-$result_main = SQL_QUERY("SELECT
-       `userid`,`holiday_activated`
+$result_main = sqlQuery("SELECT
+       `userid`,
+       `holiday_activated`
 FROM
        `{?_MYSQL_PREFIX?}_user_data`
 WHERE
@@ -63,15 +59,16 @@ ORDER BY
 __FILE__, __LINE__);
 
 // Entries found?
-if (!SQL_HASZERONUMS($result_main)) {
+if (!ifSqlHasZeroNumRows($result_main)) {
        // Init SQLs
        initSqls();
 
        // We have found at least one useraccount so let's check it...
-       while ($content = SQL_FETCHARRAY($result_main)) {
+       while ($content = sqlFetchArray($result_main)) {
                // Check if his holiday can be activated
-               $result_holiday = SQL_QUERY_ESC("SELECT
-       `holiday_start`,`holiday_end`
+               $result_holiday = sqlQueryEscaped("SELECT
+       `holiday_start`,
+       `holiday_end`
 FROM
        `{?_MYSQL_PREFIX?}_user_holidays`
 WHERE
@@ -82,9 +79,9 @@ LIMIT 1",
                        array(bigintval($content['userid'])), __FILE__, __LINE__);
 
                // Is there an entry?
-               if (SQL_NUMROWS($result_holiday) == 1) {
+               if (sqlNumRows($result_holiday) == 1) {
                        // Okay, this user can be send away to holiday...
-                       $content = merge_array($content, SQL_FETCHARRAY($result_holiday));
+                       $content = merge_array($content, sqlFetchArray($result_holiday));
 
                        // Prepare all data for the template
                        $content = merge_array($content, array(
@@ -98,18 +95,18 @@ LIMIT 1",
                        sendEmail($content['userid'], '{--MEMBER_HOLIDAY_ACTIVATED_SUBJECT--}', $message);
 
                        // Update account
-                       addSql(SQL_QUERY_ESC("UPDATE
+                       addSql(sqlQueryEscaped("UPDATE
        `{?_MYSQL_PREFIX?}_user_data`
 SET
        `holiday_active`='Y'
 WHERE
        `userid`=%s
 LIMIT 1",
-                               array(bigintval($content['userid'])), __FILE__, __LINE__, false));
+                               array(bigintval($content['userid'])), __FILE__, __LINE__, FALSE));
                } // END - if
 
                // Free memory
-               SQL_FREERESULT($result_holiday);
+               sqlFreeResult($result_holiday);
        } // END - while
 
        // Run all SQLs
@@ -117,7 +114,7 @@ LIMIT 1",
 } // END - if
 
 // Free memory
-SQL_FREERESULT($result_main);
+sqlFreeResult($result_main);
 
 // Stop currently activated holidays
 stopHolidays();