X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fdaily%2Fdaily_holiday.php;h=f091c5c2ddbc5b77e490e09b7b765aa6066913c5;hb=0b4c98232a5c9c5b934a5049dc3c84ad32ab1125;hp=a8ae1c744acfb5f79140e97c28ad71f34c612b87;hpb=0f3a135204757cc8750262871c8e62c42300acb4;p=mailer.git diff --git a/inc/daily/daily_holiday.php b/inc/daily/daily_holiday.php index a8ae1c744a..f091c5c2dd 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,16 +42,17 @@ 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; } // Debug line -//* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Daily reset started.'); +//* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Daily reset started'); // 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 @@ -123,7 +125,7 @@ SQL_FREERESULT($result_main); stopHolidays(); // Debug line -//* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Daily reset ended.'); +//* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Daily reset ended'); // [EOF] ?>