X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fdaily%2Fdaily_holiday.php;h=e1488dd0bfa13f80f3111d4abdd73ce1bb34aa92;hb=2cf4fdd43142b6ed33e4fa3a22539a415333a643;hp=7fe78a87c56edefdd7c4b2d53d7b670014964040;hpb=c3b4eaf29946349ff058691db2dcb615a5379bb2;p=mailer.git

diff --git a/inc/daily/daily_holiday.php b/inc/daily/daily_holiday.php
index 7fe78a87c5..e1488dd0bf 100644
--- a/inc/daily/daily_holiday.php
+++ b/inc/daily/daily_holiday.php
@@ -16,8 +16,8 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2012 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 *
@@ -42,7 +42,7 @@ if (!defined('__SECURITY')) {
 	// 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.');
+	logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension ext-holiday disabled.');
 	return;
 }
 
@@ -51,7 +51,8 @@ if (!defined('__SECURITY')) {
 
 // Check for holidays we need to enable and send email to user
 $result_main = SQL_QUERY("SELECT
-	`userid`, `holiday_activated`
+	`userid`,
+	`holiday_activated`
 FROM
 	`{?_MYSQL_PREFIX?}_user_data`
 WHERE
@@ -71,7 +72,8 @@ if (!SQL_HASZERONUMS($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`
+	`holiday_start`,
+	`holiday_end`
 FROM
 	`{?_MYSQL_PREFIX?}_user_holidays`
 WHERE
@@ -81,7 +83,7 @@ WHERE
 LIMIT 1",
 			array(bigintval($content['userid'])), __FILE__, __LINE__);
 
-		// Do we have an entry?
+		// Is there 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));
@@ -105,7 +107,7 @@ SET
 WHERE
 	`userid`=%s
 LIMIT 1",
-				array(bigintval($content['userid'])), __FILE__, __LINE__, false));
+				array(bigintval($content['userid'])), __FILE__, __LINE__, FALSE));
 		} // END - if
 
 		// Free memory