X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Fholiday_functions.php;h=340a5abac88052afbc85c42ed1bb3096e61f0f06;hb=99966a712b3b3d8b521524762e153353d1d20bd4;hp=0d4d06d50de9b342cc5c8e6bb5743d527e546cd3;hpb=263a089d8a499e0e26d0af9e7aa7639f88b8ca60;p=mailer.git

diff --git a/inc/libs/holiday_functions.php b/inc/libs/holiday_functions.php
index 0d4d06d50d..340a5abac8 100644
--- a/inc/libs/holiday_functions.php
+++ b/inc/libs/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 *
@@ -44,61 +43,82 @@ if (!defined('__SECURITY')) {
 // Stops all expired holidays
 function stopHolidays () {
 	// Let's find some expired holiday requests...
-	$result_stop = SQL_QUERY("SELECT
-	`userid`, `holiday_start`, `holiday_end`, `comments`
+	$result_stop = sqlQuery("SELECT
+	`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 (!ifSqlHasZeroNums($result_stop)) {
 		// We foud at least one
 		$admin = '';
+
 		// Init SQLs
 		initSqls();
 
 		// Process all found entries
-		while ($content = SQL_FETCHARRAY($result_stop)) {
-			// Stop2 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));
+		while ($content = sqlFetchArray($result_stop)) {
+			// Stop holiday
+			addSql(sqlQueryEscaped("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_holidays` WHERE `userid`=%s LIMIT 1",
+				array(bigintval($content['userid'])), __FUNCTION__, __LINE__, FALSE));
 
 			// Unlock account
-			addSql(SQL_QUERY_ESC("UPDATE
+			addSql(sqlQueryEscaped("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');
 	} // END - if
 
 	// Free memory
-	SQL_FREERESULT($result_stop);
+	sqlFreeResult($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]
 ?>