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

diff --git a/inc/reset/reset_holiday.php b/inc/reset/reset_holiday.php
index 6c82e94e93..f7752968ec 100644
--- a/inc/reset/reset_holiday.php
+++ b/inc/reset/reset_holiday.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Dinge, die beim taeglichen Reset erledigt werden *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * Needs to be in all Files and every File needs "svn propset           *
+ * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2008 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
@@ -33,51 +38,65 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
 	require($INC);
-} elseif (!EXT_IS_ACTIVE("holiday")) {
+} elseif (!EXT_IS_ACTIVE('holiday')) {
 	return;
 }
 
 // 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__);
+ORDER BY holiday_activated",
+	__FILE__, __LINE__);
+
+// Entries found?
 if (SQL_NUMROWS($result_main) > 0) {
+	// Init SQLs
+	INIT_SQLS();
+
 	// We have found at least one useraccount so let's check it...
-	while(list($uid, $activated) = SQL_FETCHROW($result_main)) {
+	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() LIMIT 1",
- array(bigintval($uid)), __FILE__, __LINE__);
-		if (SQL_NUMROWS($result_holiday) == 1)
-		{
+		$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__);
+		if (SQL_NUMROWS($result_holiday) == 1) {
 			// Okay, this user can be send away to holiday...
-			list($start, $end) = SQL_FETCHROW($result_holiday);
+			$content = merge_array($content, SQL_FETCHARRAY($result_holiday));
 
 			// Prepare all data for the template
 			$content = array(
-				'activated' => MAKE_DATETIME($activated, "1"),
-				'start'     => MAKE_DATETIME($start    , "1"),
-				'end'       => MAKE_DATETIME($end      , "1")
+				'activated' => MAKE_DATETIME($content['holiday_activated'], "1"),
+				'start'     => MAKE_DATETIME($content['holiday_start']    , "1"),
+				'end'       => MAKE_DATETIME($content['holiday_end']      , "1")
 			);
 
 			// Send email to user
-			$msg = LOAD_EMAIL_TEMPLATE("member_holiday_activated", $content, $uid);
-			SEND_EMAIL($uid, HOLIDAY_MEMBER_ACTIVATED, $msg);
+			$msg = LOAD_EMAIL_TEMPLATE("member_holiday_activated", $content, $content['userid']);
+			SEND_EMAIL($content['userid'], getMessage('HOLIDAY_MEMBER_ACTIVATED_SUBJ'), $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__);
-		}
+			ADD_SQL(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
 
 		// Free memory
 		SQL_FREERESULT($result_holiday);
-	}
+	} // END - while
+
+	// Run all SQLs
+	runFilterChain('run_sqls');
 }
 
 // Free memory