A lot rewrites from double-quote to single-quote, some fixes for extension handling...

[mailer.git] / inc / modules / member / what-holiday.php

diff --git a/inc/modules/member/what-holiday.php b/inc/modules/member/what-holiday.php
index d156309ff58c173959605f695e0721e0e0847b08..e33a813917a7248fd38064bb42cdca6ff092451f 100644 (file)
--- a/inc/modules/member/what-holiday.php
+++ b/inc/modules/member/what-holiday.php
@@ -41,14 +41,14 @@ if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 } elseif (!IS_MEMBER()) {
-       LOAD_URL("modules.php?module=index");
-} elseif ((!EXT_IS_ACTIVE("holiday")) && (!IS_ADMIN())) {
-       addFatalMessage(__FILE__, __LINE__, getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), "holiday");
+       LOAD_URL('modules.php?module=index');
+} elseif ((!EXT_IS_ACTIVE('holiday')) && (!IS_ADMIN())) {
+       addFatalMessage(__FILE__, __LINE__, getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), 'holiday');
        return;
 }
 
 // Add description as navigation point
-ADD_DESCR("member", __FILE__);
+ADD_DESCR('member', __FILE__);
 
 // Check for running mail orders in pool
 $result1 = SQL_QUERY_ESC("SELECT timestamp FROM `{!_MYSQL_PREFIX!}_pool`
@@ -79,7 +79,7 @@ if ((SQL_NUMROWS($result1) == 1) || (SQL_NUMROWS($result2) == 1)) {
                }
 
                // Display message and exit here
-               LOAD_TEMPLATE("admin_settings_saved", false, sprintf(getMessage('HOLIDAY_MEMBER_ORDER'), MAKE_DATETIME($stamp, "1")));
+               LOAD_TEMPLATE('admin_settings_saved', false, sprintf(getMessage('HOLIDAY_MEMBER_ORDER'), MAKE_DATETIME($stamp, "1")));
                return;
        }
 }
@@ -130,7 +130,7 @@ WHERE userid=%s LIMIT 1",
                 array(getUserId(), $msg), __FILE__, __LINE__);
 
                // Display message
-               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('HOLIDAY_IS_ACTIVATED_NOW'));
+               LOAD_TEMPLATE('admin_settings_saved', false, getMessage('HOLIDAY_IS_ACTIVATED_NOW'));
        }
 }
 
@@ -143,7 +143,7 @@ WHERE userid=%s LIMIT 1", array(getUserId()), __FILE__, __LINE__);
        list($active, $locked) = SQL_FETCHROW($result);
        SQL_FREERESULT($result);
 
-       if (($active == "Y") && (($locked + getConfig('holiday_lock')) < time()))
+       if (($active == 'Y') && (($locked + getConfig('holiday_lock')) < time()))
        {
                // Load data
                $result = SQL_QUERY_ESC("SELECT holiday_start, holiday_end FROM `{!_MYSQL_PREFIX!}_user_holidays`
@@ -171,14 +171,14 @@ WHERE userid=%s LIMIT 1", array(getUserId()), __FILE__, __LINE__);
                        SEND_ADMIN_NOTIFICATION(getMessage('HOLIDAY_ADMIN_DEAC_SUBJ'), "admin_holiday_deactivated", array(), getUserId());
 
                        // Display message to user
-                       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('HOLIDAY_MEMBER_DEACTIVATED_NOW'));
+                       LOAD_TEMPLATE('admin_settings_saved', false, getMessage('HOLIDAY_MEMBER_DEACTIVATED_NOW'));
                } else {
                        // Display message to user
-                       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('HOLIDAY_MEMBER_CANNOT_DEACTIVATE'));
+                       LOAD_TEMPLATE('admin_settings_saved', false, getMessage('HOLIDAY_MEMBER_CANNOT_DEACTIVATE'));
                }
-       } elseif ($active == "Y") {
+       } elseif ($active == 'Y') {
                // To fast!
-               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('HOLIDAY_MEMBER_LOCKED'));
+               LOAD_TEMPLATE('admin_settings_saved', false, getMessage('HOLIDAY_MEMBER_LOCKED'));
        }
 }
 
@@ -197,7 +197,7 @@ WHERE userid=%s LIMIT 1", array(getUserId()), __FILE__, __LINE__);
                // User can deactivate his holiday request
                switch ($active)
                {
-               case "Y": // Display deactivation form
+               case 'Y': // Display deactivation form
                        // Load starting and ending date
                        $result = SQL_QUERY_ESC("SELECT holiday_start, holiday_end FROM `{!_MYSQL_PREFIX!}_user_holidays`
 WHERE userid=%s LIMIT 1", array(getUserId()), __FILE__, __LINE__);
@@ -229,7 +229,7 @@ WHERE userid=%s LIMIT 1", array(getUserId()), __FILE__, __LINE__);
                        }
                        break;
 
-               case "N": // Display activation form
+               case 'N': // Display activation form
                        // Starting day
                        define('_START_DAY'  , ADD_SELECTION("day"  , date("d", (time() + getConfig('one_day'))), "start"));
                        define('_START_MONTH', ADD_SELECTION("month", date("m", (time() + getConfig('one_day'))), "start"));
@@ -254,7 +254,7 @@ WHERE userid=%s LIMIT 1", array(getUserId()), __FILE__, __LINE__);
                }
        } else {
                // To fast!
-               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('HOLIDAY_MEMBER_LOCKED'));
+               LOAD_TEMPLATE('admin_settings_saved', false, getMessage('HOLIDAY_MEMBER_LOCKED'));
        }
 }
 //