- Daily/weekly/monthly reset completely rewritten

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

diff --git a/inc/reset/reset_holiday.php b/inc/reset/reset_holiday.php
index 93397faf1afcd38379f30b877f8dbbbb73888ae5..45e8b9fd48e6096ac296d35beeb19f3af68e2b40 100644 (file)
--- a/inc/reset/reset_holiday.php
+++ b/inc/reset/reset_holiday.php
@@ -32,13 +32,10 @@
  ************************************************************************/
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
-{
+if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
-}
- elseif ((!EXT_IS_ACTIVE("holiday")) && (!IS_ADMIN()))
-{
+} elseif ((!EXT_IS_ACTIVE("holiday")) && (!IS_ADMIN())) {
        ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "holiday");
        return;
 }
@@ -50,11 +47,9 @@ if (($CSS == 1) || ((!isBooleanConstantAndTrue('__DAILY_RESET')) && ($_CONFIG['h
 $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'
 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=%s AND holiday_start <= ".time()." AND holiday_end > ".time()." LIMIT 1",