X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Fholiday_functions.php;h=ce20531437a10b33bef763972d913f545da39168;hb=4f089d36fcc801992932f3a1f47ab139b573a38d;hp=e23f772dd42fda387cad593560c43d5627de682f;hpb=f928ad2bed60fa256d0641eaf6d2c027a2944688;p=mailer.git

diff --git a/inc/libs/holiday_functions.php b/inc/libs/holiday_functions.php
index e23f772dd4..ce20531437 100644
--- a/inc/libs/holiday_functions.php
+++ b/inc/libs/holiday_functions.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 07/31/2003 *
- * ===============                              Last change: 08/02/2003 *
+ * Mailer v0.2.1-FINAL                                Start: 07/31/2003 *
+ * ===================                          Last change: 08/02/2003 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : holiday_functions.php                            *
@@ -17,7 +17,8 @@
  * 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,17 +39,16 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
-	require($INC);
-}
+	die();
+} // END - if
 
-//
-function HOLIDAY_STOP_HOLIDAYS () {
+// Stops all expired holidays
+function stopHolidays () {
 	// Let's find some expired holiday requests...
 	$result_stop = SQL_QUERY("SELECT
 	`userid`, `holiday_start`, `holiday_end`, `comments`
 FROM
-	`{!_MYSQL_PREFIX!}_user_holidays`
+	`{?_MYSQL_PREFIX?}_user_holidays`
 WHERE
 	`holiday_end` <= UNIX_TIMESTAMP()
 ORDER BY
@@ -56,18 +56,19 @@ ORDER BY
 	if (SQL_NUMROWS($result_stop) > 0) {
 		// We foud at least one
 		$admin = '';
+
 		// Init SQLs
-		INIT_SQLS();
+		initSqls();
 
 		// Process all found entries
 		while ($content = SQL_FETCHARRAY($result_stop)) {
 			// Stop holiday
-			ADD_SQL(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_user_holidays` WHERE `userid`=%s LIMIT 1",
+			addSql(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_holidays` WHERE `userid`=%s LIMIT 1",
 				array(bigintval($content['userid'])), __FUNCTION__, __LINE__, false));
 
 			// Unlock account
-			ADD_SQL(SQL_QUERY_ESC("UPDATE
-	`{!_MYSQL_PREFIX!}_user_data`
+			addSql(SQL_QUERY_ESC("UPDATE
+	`{?_MYSQL_PREFIX?}_user_data`
 SET
 	`holiday_active`='N', `holiday_activated`=0
 WHERE
@@ -76,22 +77,22 @@ LIMIT 1",
 				array(bigintval($content['userid'])), __FUNCTION__, __LINE__, false));
 
 			// Prepare array
-			$content = array(
-				'holiday_end'      => generateDateTime($content['holiday_end']  , '3'),
-				'holiday_start'    => generateDateTime($content['holiday_start'], '3'),
+			$content = merge_array($content, array(
+				'holiday_end'      => generateDateTime($content['holiday_end']  , 3),
+				'holiday_start'    => generateDateTime($content['holiday_start'], 3),
 				'holiday_comments' => $content['comments']
-			);
+			));
 
 			// Send mail to user
-			$message = LOAD_EMAIL_TEMPLATE('member_holiday_unlock', $content, $content['userid']);
-			sendEmail($content['userid'], getMessage('HOLIDAY_MEMBER_UNLOCK_SUBJ'), $message);
+			$message = loadEmailTemplate('member_holiday_unlock', $content, $content['userid']);
+			sendEmail($content['userid'], '{--HOLIDAY_MEMBER_UNLOCK_SUBJECT--}', $message);
 
 			// Remember userid for admin
 			$admin .= $content['userid']."\n";
 		} // END - if
 
 		// Send mail to admins
-		sendAdminNotification(getMessage('HOLIDAY_ADMIN_UNLOCK_SUBJ'), 'admin_holiday_unlock', $admin, '0');
+		sendAdminNotification('{--ADMIN_HOLIDAY_UNLOCK_SUBJECT--}', 'admin_holiday_unlock', $admin);
 
 		// Run all SQLs
 		runFilterChain('run_sqls');
@@ -101,5 +102,5 @@ LIMIT 1",
 	SQL_FREERESULT($result_stop);
 }
 
-//
+// [EOF]
 ?>