X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Freset%2Freset_holiday.php;h=bf8fffcb42c3047d68c8c83378214bc73d6a0980;hp=f6b4dd86a78a73298c2f7ec5735dff92599b56ae;hb=fc162164725588cf75969f707faead9c9cd8e68b;hpb=414570c5081d337bb6c28dcf521bd8bca02f69e7

diff --git a/inc/reset/reset_holiday.php b/inc/reset/reset_holiday.php
index f6b4dd86a7..bf8fffcb42 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                                *
@@ -10,14 +10,15 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Dinge, die beim taeglichen Reset erledigt werden *
  * -------------------------------------------------------------------- *
- * $Revision:: 856                                                    $ *
- * $Date:: 2009-03-06 20:24:32 +0100 (Fr, 06. Mär 2009)              $ *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
- * $Author:: stelzi                                                   $ *
+ * $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                           *
+ * 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 *
@@ -38,55 +39,70 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
-	require($INC);
-} elseif (!EXT_IS_ACTIVE("holiday")) {
+	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 (($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`
-WHERE holiday_activated > 0 AND holiday_activated < UNIX_TIMESTAMP() AND holiday_active='N'
-ORDER BY holiday_activated",
-	__FILE__, __LINE__);
+$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?
 if (SQL_NUMROWS($result_main) > 0) {
 	// Init SQLs
-	INIT_SQLS();
+	initSqls();
 
 	// 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__);
+
+		// 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(
-				'activated' => MAKE_DATETIME($content['holiday_activated'], "1"),
-				'start'     => MAKE_DATETIME($content['holiday_start']    , "1"),
-				'end'       => MAKE_DATETIME($content['holiday_end']      , "1")
-			);
+			$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
-			$msg = LOAD_EMAIL_TEMPLATE("member_holiday_activated", $content, $content['userid']);
-			SEND_EMAIL($content['userid'], getMessage('HOLIDAY_MEMBER_ACTIVATED_SUBJ'), $msg);
+			$message = loadEmailTemplate('member_holiday_activated', $content, $content['userid']);
+			sendEmail($content['userid'], '{--HOLIDAY_MEMBER_ACTIVATED_SUBJ--}', $message);
 
 			// Update account
-			ADD_SQL(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
@@ -97,13 +113,13 @@ LIMIT 1",
 
 	// Run all SQLs
 	runFilterChain('run_sqls');
-}
+} // END - if
 
 // Free memory
 SQL_FREERESULT($result_main);
 
 // Stop currently activated holidays
-HOLIDAY_STOP_HOLIDAYS();
+stopHolidays();
 
-//
+// [EOF]
 ?>