X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fdaily%2Fdaily_holiday.php;h=10a7253bb7a975ca5bf1428d50801fe6d430dee3;hp=b906bd09553ebe09de9295addbb4314cbdf7bc55;hb=49acdb7a7adbcf25a8e8683b5581bfcec72b23bd;hpb=2df9f7a53f8b1dd5164f87824a324ccb3b6634cb

diff --git a/inc/daily/daily_holiday.php b/inc/daily/daily_holiday.php
index b906bd0955..10a7253bb7 100644
--- 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,7 +45,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 +59,14 @@ 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
+		$result_holiday = sqlQueryEscaped("SELECT
 	`holiday_start`,
 	`holiday_end`
 FROM
@@ -84,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(
@@ -100,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
@@ -119,7 +114,7 @@ LIMIT 1",
 } // END - if
 
 // Free memory
-SQL_FREERESULT($result_main);
+sqlFreeResult($result_main);
 
 // Stop currently activated holidays
 stopHolidays();