Some fixes:

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

diff --git a/inc/daily/daily_holiday.php b/inc/daily/daily_holiday.php
index b35ae3e79d1ec5754d7ba30f6617c4fe965ef0ed..1470a279832c8b22a3c3a2591fddfe36144aa3c0 100644 (file)
--- a/inc/daily/daily_holiday.php
+++ b/inc/daily/daily_holiday.php
@@ -50,7 +50,7 @@ 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
+$result_main = sqlQuery("SELECT
        `userid`,
        `holiday_activated`
 FROM
@@ -64,14 +64,14 @@ ORDER BY
 __FILE__, __LINE__);
 
 // Entries found?
-if (!SQL_HASZERONUMS($result_main)) {
+if (!ifSqlHasZeroNums($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
+               $result_holiday = sqlQueryEscaped("SELECT
        `holiday_start`,
        `holiday_end`
 FROM
@@ -84,9 +84,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(
@@ -100,7 +100,7 @@ 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'
@@ -111,7 +111,7 @@ LIMIT 1",
                } // END - if
 
                // Free memory
-               SQL_FREERESULT($result_holiday);
+               sqlFreeResult($result_holiday);
        } // END - while
 
        // Run all SQLs
@@ -119,7 +119,7 @@ LIMIT 1",
 } // END - if
 
 // Free memory
-SQL_FREERESULT($result_main);
+sqlFreeResult($result_main);
 
 // Stop currently activated holidays
 stopHolidays();