Fix in CREATE_EXTENSION_DEACTIVATION_TASK() and coding-style updated

[mailer.git] / inc / reset / reset_holiday.php

diff --git a/inc/reset/reset_holiday.php b/inc/reset/reset_holiday.php
index 68604f82897690dc8e14d04a08eb27c3a531052c..1881d7ff43130e78eadaf0b3fb4b6de27b261f18 100644 (file)
--- a/inc/reset/reset_holiday.php
+++ b/inc/reset/reset_holiday.php
@@ -32,32 +32,27 @@
  ************************************************************************/
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
-{
+if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
-}
- elseif ((!EXT_IS_ACTIVE("holiday")) && (!IS_ADMIN()))
-{
-       ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "holiday");
+} elseif (!EXT_IS_ACTIVE("holiday")) {
        return;
 }
 
 // Do not execute when script is in CSS mode or no daily reset
-if (($CSS == 1) || ((!defined('__DAILY_RESET')) && ($CONFIG['holiday_mode'] == "RESET"))) return;
+if (($CSS == 1) || ((!defined('__DAILY_RESET')) && (getConfig('holiday_mode') == "RESET"))) return;
+//* DEBUG: */ echo basename(__FILE__)."<br />\n";
 
 // Check for holidays we need to enable and send email to user
 $result_main = SQL_QUERY("SELECT userid, holiday_activated FROM "._MYSQL_PREFIX."_user_data
-WHERE holiday_activated > 0 AND holiday_activated < ".time()." AND holiday_active='N'
+WHERE holiday_activated > 0 AND holiday_activated < UNIX_TIMESTAMP() AND holiday_active='N'
 ORDER BY holiday_activated", __FILE__, __LINE__);
-if (SQL_NUMROWS($result_main) > 0)
-{
+if (SQL_NUMROWS($result_main) > 0) {
        // We have found at least one useraccount so let's check it...
-       while(list($uid, $activated) = SQL_FETCHROW($result_main))
-       {
+       while(list($uid, $activated) = SQL_FETCHROW($result_main)) {
                // Check if his holiday can be activated
                $result_holiday = SQL_QUERY_ESC("SELECT holiday_start, holiday_end FROM "._MYSQL_PREFIX."_user_holidays
-WHERE userid=%d AND holiday_start <= ".time()." AND holiday_end > ".time()." LIMIT 1",
+WHERE userid=%s AND holiday_start <= UNIX_TIMESTAMP() AND holiday_end > UNIX_TIMESTAMP() LIMIT 1",
  array(bigintval($uid)), __FILE__, __LINE__);
                if (SQL_NUMROWS($result_holiday) == 1)
                {
@@ -76,8 +71,9 @@ WHERE userid=%d AND holiday_start <= ".time()." AND holiday_end > ".time()." LIM
                        SEND_EMAIL($uid, HOLIDAY_MEMBER_ACTIVATED, $msg);
 
                        // Update account
-                       $result_update = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data SET holiday_active='Y'
-WHERE userid=%d LIMIT 1", array(bigintval($uid)), __FILE__, __LINE__);
+                       SQL_QUERY_ESC("UPDATE `"._MYSQL_PREFIX."_user_data` SET holiday_active='Y'
+WHERE userid=%s
+LIMIT 1", array(bigintval($uid)), __FILE__, __LINE__);
                }
 
                // Free memory