X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Fholiday_functions.php;h=01a28020d324cde3d3f02c7367945fdafedafd61;hp=a14fa0d6e3a012635a13d8b67c3cb0c07aeddea5;hb=cd7d344ea7007cfa20413acd3e03e50f0ab86d86;hpb=c2e17d983fcbc0c3bd1dd37908d87c678f0367df

diff --git a/inc/libs/holiday_functions.php b/inc/libs/holiday_functions.php
index a14fa0d6e3..01a28020d3 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                            *
@@ -14,11 +14,10 @@
  * $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 - 2009 by Roland Haeder                           *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -45,16 +44,20 @@ if (!defined('__SECURITY')) {
 function stopHolidays () {
 	// Let's find some expired holiday requests...
 	$result_stop = SQL_QUERY("SELECT
-	`userid`, `holiday_start`, `holiday_end`, `comments`
+	`userid`,
+	`holiday_start`,
+	`holiday_end`,
+	`comments`
 FROM
 	`{?_MYSQL_PREFIX?}_user_holidays`
 WHERE
 	`holiday_end` <= UNIX_TIMESTAMP()
 ORDER BY
 	`userid` ASC", __FUNCTION__, __LINE__);
-	if (SQL_NUMROWS($result_stop) > 0) {
+	if (!SQL_HASZERONUMS($result_stop)) {
 		// We foud at least one
 		$admin = '';
+
 		// Init SQLs
 		initSqls();
 
@@ -62,35 +65,36 @@ ORDER BY
 		while ($content = SQL_FETCHARRAY($result_stop)) {
 			// Stop holiday
 			addSql(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_holidays` WHERE `userid`=%s LIMIT 1",
-				array(bigintval($content['userid'])), __FUNCTION__, __LINE__, false));
+				array(bigintval($content['userid'])), __FUNCTION__, __LINE__, FALSE));
 
 			// Unlock account
 			addSql(SQL_QUERY_ESC("UPDATE
 	`{?_MYSQL_PREFIX?}_user_data`
 SET
-	`holiday_active`='N', `holiday_activated`=0
+	`holiday_active`='N',
+	`holiday_activated`=0
 WHERE
 	`userid`=%s
 LIMIT 1",
-				array(bigintval($content['userid'])), __FUNCTION__, __LINE__, false));
+				array(bigintval($content['userid'])), __FUNCTION__, __LINE__, FALSE));
 
 			// Prepare array
-			$content = array(
+			$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 = loadEmailTemplate('member_holiday_unlock', $content, $content['userid']);
-			sendEmail($content['userid'], getMessage('HOLIDAY_MEMBER_UNLOCK_SUBJ'), $message);
+			sendEmail($content['userid'], '{--MEMBER_HOLIDAY_UNLOCK_SUBJECT--}', $message);
 
 			// Remember userid for admin
-			$admin .= $content['userid']."\n";
+			$admin .= $content['userid'] . PHP_EOL;
 		} // 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');
@@ -100,5 +104,21 @@ LIMIT 1",
 	SQL_FREERESULT($result_stop);
 }
 
-//
+// ----------------------------------------------------------------------------
+//                 Wrapper functions for configuration entries
+// ----------------------------------------------------------------------------
+
+// Getter for user_alpha
+function getHolidayLock () {
+	// Is there cache?
+	if (!isset($GLOBALS[__FUNCTION__])) {
+		// Determine it
+		$GLOBALS[__FUNCTION__] = getConfig('holiday_lock');
+	} // END - if
+
+	// Return cache
+	return $GLOBALS[__FUNCTION__];
+}
+
+// [EOF]
 ?>