X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Freset%2Freset_holiday.php;h=09c45a55b756c55f1544b9770724b7f5eafb7acc;hb=f2aeaab0cd313b2eeb151642455ed558f6b186dc;hp=6a4fb039433795320cb42f23644c2f208f7ad001;hpb=c2e17d983fcbc0c3bd1dd37908d87c678f0367df;p=mailer.git

diff --git a/inc/reset/reset_holiday.php b/inc/reset/reset_holiday.php
index 6a4fb03943..09c45a55b7 100644
--- a/inc/reset/reset_holiday.php
+++ b/inc/reset/reset_holiday.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 12/10/2005 *
- * ===============                              Last change: 12/10/2005 *
+ * Mailer v0.2.1-FINAL                                Start: 12/10/2005 *
+ * ===================                          Last change: 06/20/2010 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : reset_holiday.php                                *
@@ -18,6 +18,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -39,19 +40,25 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
 	die();
+} elseif ((getOutputMode() != 0) || ((!isResetModeEnabled()) && (getConfig('holiday_mode') == 'RESET'))) {
+	// Do not execute when script is in CSS mode or no daily reset
+	return;
 } elseif (!isExtensionActive('holiday')) {
+	logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension disabled.');
 	return;
 }
 
-// Do not execute when script is in CSS mode or no daily reset
-if ((getOutputMode() != 0) || ((!isResetModeEnabled()) && (getConfig('holiday_mode') == 'RESET'))) return;
-//* DEBUG: */ outputHtml(basename(__FILE__)."<br />");
-
 // 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`
-WHERE holiday_activated > 0 AND holiday_activated < UNIX_TIMESTAMP() AND `holiday_active`='N'
-ORDER BY holiday_activated",
+$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` ASC",
 __FILE__, __LINE__);
 
 // Entries found?
@@ -62,30 +69,40 @@ if (SQL_NUMROWS($result_main) > 0) {
 	// We have found at least one useraccount so let's check it...
 	while ($content = SQL_FETCHARRAY($result_main)) {
 		// Check if his holiday can be activated
-		$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()
+		$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($content['userid'])), __FILE__, __LINE__);
+			array(bigintval($content['userid'])), __FILE__, __LINE__);
+
+		// Do we have an entry?
 		if (SQL_NUMROWS($result_holiday) == 1) {
 			// Okay, this user can be send away to holiday...
 			$content = merge_array($content, SQL_FETCHARRAY($result_holiday));
 
 			// Prepare all data for the template
-			$content = array(
+			$content = merge_array($content, array(
 				'activated' => generateDateTime($content['holiday_activated'], 1),
 				'start'     => generateDateTime($content['holiday_start']    , 1),
 				'end'       => generateDateTime($content['holiday_end']      , 1)
-			);
+			));
 
 			// Send email to user
 			$message = loadEmailTemplate('member_holiday_activated', $content, $content['userid']);
 			sendEmail($content['userid'], getMessage('HOLIDAY_MEMBER_ACTIVATED_SUBJ'), $message);
 
 			// Update account
-			addSql(SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data`
-SET `holiday_active`='Y'
-WHERE `userid`=%s
+			addSql(SQL_QUERY_ESC("UPDATE
+	`{?_MYSQL_PREFIX?}_user_data`
+SET
+	`holiday_active`='Y'
+WHERE
+	`userid`=%s
 LIMIT 1",
 				array(bigintval($content['userid'])), __FILE__, __LINE__, false));
 		} // END - if
@@ -96,7 +113,7 @@ LIMIT 1",
 
 	// Run all SQLs
 	runFilterChain('run_sqls');
-}
+} // END - if
 
 // Free memory
 SQL_FREERESULT($result_main);