X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Freset%2Freset_holiday.php;h=741ebe3110a3d0d92f7ca7ba2f2e0ece6440db35;hb=5f5a73c72457ea761906640dc3d29749301102f9;hp=6c82e94e9398140edaecce6fd55560598df1ccdd;hpb=6c763653e88b9d10627e651ca59c7201d4b7d62b;p=mailer.git

diff --git a/inc/reset/reset_holiday.php b/inc/reset/reset_holiday.php
index 6c82e94e93..741ebe3110 100644
--- a/inc/reset/reset_holiday.php
+++ b/inc/reset/reset_holiday.php
@@ -40,18 +40,18 @@ if (!defined('__SECURITY')) {
 }
 
 // Do not execute when script is in CSS mode or no daily reset
-if (($CSS == 1) || ((!defined('__DAILY_RESET')) && ($_CONFIG['holiday_mode'] == "RESET"))) return;
+if (($GLOBALS['output_mode'] == 1) || ((!isResetModeEnabled()) && (getConfig('holiday_mode') == "RESET"))) return;
 //* DEBUG: */ echo basename(__FILE__)."<br />\n";
 
 // Check for holidays we need to enable and send email to user
-$result_main = SQL_QUERY("SELECT userid, holiday_activated FROM "._MYSQL_PREFIX."_user_data
+$result_main = SQL_QUERY("SELECT userid, holiday_activated FROM `{!_MYSQL_PREFIX!}_user_data`
 WHERE holiday_activated > 0 AND holiday_activated < UNIX_TIMESTAMP() AND holiday_active='N'
 ORDER BY holiday_activated", __FILE__, __LINE__);
 if (SQL_NUMROWS($result_main) > 0) {
 	// We have found at least one useraccount so let's check it...
-	while(list($uid, $activated) = SQL_FETCHROW($result_main)) {
+	while (list($uid, $activated) = SQL_FETCHROW($result_main)) {
 		// Check if his holiday can be activated
-		$result_holiday = SQL_QUERY_ESC("SELECT holiday_start, holiday_end FROM "._MYSQL_PREFIX."_user_holidays
+		$result_holiday = SQL_QUERY_ESC("SELECT holiday_start, holiday_end FROM `{!_MYSQL_PREFIX!}_user_holidays`
 WHERE userid=%s AND holiday_start <= UNIX_TIMESTAMP() AND holiday_end > UNIX_TIMESTAMP() LIMIT 1",
  array(bigintval($uid)), __FILE__, __LINE__);
 		if (SQL_NUMROWS($result_holiday) == 1)
@@ -71,8 +71,9 @@ WHERE userid=%s AND holiday_start <= UNIX_TIMESTAMP() AND holiday_end > UNIX_TIM
 			SEND_EMAIL($uid, HOLIDAY_MEMBER_ACTIVATED, $msg);
 
 			// Update account
-			$result_update = SQL_QUERY_ESC("UPDATE `"._MYSQL_PREFIX."_user_data` SET holiday_active='Y'
-WHERE userid=%s LIMIT 1", array(bigintval($uid)), __FILE__, __LINE__);
+			SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET holiday_active='Y'
+WHERE userid=%s
+LIMIT 1", array(bigintval($uid)), __FILE__, __LINE__);
 		}
 
 		// Free memory