* Member template added for the surfbar which notifies the user that the URL is

[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 6b58f029af390d611f453b4087976a18514dc7da..57c5e3848506393062505f42110774c178af9d2f 100644 (file)
--- a/inc/modules/member/what-holiday.php
+++ b/inc/modules/member/what-holiday.php
@@ -39,7 +39,7 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
 }
  elseif (!IS_LOGGED_IN())
 {
-       LOAD_URL(URL."/modules.php?module=index");
+       LOAD_URL("modules.php?module=index");
 }
  elseif ((!EXT_IS_ACTIVE("holiday")) && (!IS_ADMIN()))
 {
@@ -66,13 +66,13 @@ if ((SQL_NUMROWS($result1) == 1) || (SQL_NUMROWS($result2) == 1))
        if (empty($stamp1)) $stamp1 = 0;
        if (empty($stamp2)) $stamp2 = 0;
 
-       if ((($stamp1 + $CONFIG['holiday_lock']) > time()) || (($stamp2 + $CONFIG['holiday_lock']) > time()))
+       if ((($stamp1 + $_CONFIG['holiday_lock']) > time()) || (($stamp2 + $_CONFIG['holiday_lock']) > time()))
        {
                // Mail order is to close away!
                unset($_POST['ok']);
                unset($_POST['stop']);
 
-               if (($stamp1 + $CONFIG['holiday_lock']) > time())
+               if (($stamp1 + $_CONFIG['holiday_lock']) > time())
                {
                        // Mail found in pool
                        $stamp = $stamp1;
@@ -101,7 +101,7 @@ if (isset($_POST['ok']))
 
        // Test both values
        $TEST = $END - $START;
-       if (($TEST < 0) || ($TEST > (ONE_DAY * $CONFIG['holiday_max'])) || ($START < time()) || ($END < time()))
+       if (($TEST < 0) || ($TEST > (ONE_DAY * $_CONFIG['holiday_max'])) || ($START < time()) || ($END < time()))
        {
                // Time test failed
                unset($_POST['ok']);
@@ -132,14 +132,7 @@ WHERE userid=%d LIMIT 1",
 
                // Send mail to all admins
                $msg = LOAD_EMAIL_TEMPLATE("admin_holiday_request", $_POST['comments'], $GLOBALS['userid']);
-               if (GET_EXT_VERSION("admins") >= "0.4.1")
-               {
-                       SEND_ADMIN_EMAILS_PRO(HOLIDAY_ADMIN_SUBJECT, "admin_holiday_request", $_POST['comments'], $GLOBALS['userid']);
-               }
-                else
-               {
-                       SEND_ADMIN_EMAILS(HOLIDAY_ADMIN_SUBJECT, $msg);
-               }
+               SEND_ADMIN_NOTIFICATION(HOLIDAY_ADMIN_SUBJECT, "admin_holiday_request", $_POST['comments'], $GLOBALS['userid']);
 
                // Create task
                $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_task_system (userid, assigned_admin, status, task_type, subject, text, task_created) VALUES ('%s', '0', 'NEW', 'HOLIDAY_REQUEST', '%s', '%s', UNIX_TIMESTAMP())",
@@ -159,7 +152,7 @@ WHERE userid=%d LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
        list($active, $locked) = SQL_FETCHROW($result);
        SQL_FREERESULT($result);
 
-       if (($active == 'Y') && (($locked + $CONFIG['holiday_lock']) < time()))
+       if (($active == "Y") && (($locked + $_CONFIG['holiday_lock']) < time()))
        {
                // Load data
                $result = SQL_QUERY_ESC("SELECT holiday_start, holiday_end FROM "._MYSQL_PREFIX."_user_holidays
@@ -184,15 +177,7 @@ WHERE userid=%d LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
 WHERE userid=%d LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
 
                        // Send email to admin
-                       if (GET_EXT_VERSION("admins") >= "0.4.1")
-                       {
-                               SEND_ADMIN_EMAILS_PRO(HOLIDAY_ADMIN_DEAC_SUBJ, "admin_holiday_deactivated", "", $GLOBALS['userid']);
-                       }
-                        else
-                       {
-                               $msg = LOAD_EMAIL_TEMPLATE("admin_holiday_deactivated", "", $GLOBALS['userid']);
-                               SEND_ADMIN_EMAILS(HOLIDAY_ADMIN_DEAC_SUBJ, $msg);
-                       }
+                       SEND_ADMIN_NOTIFICATION(HOLIDAY_ADMIN_DEAC_SUBJ, "admin_holiday_deactivated", "", $GLOBALS['userid']);
 
                        // Display message to user
                        LOAD_TEMPLATE("admin_settings_saved", false, HOLIDAY_MEMBER_DEACTIVATED_NOW);
@@ -203,7 +188,7 @@ WHERE userid=%d LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
                        LOAD_TEMPLATE("admin_settings_saved", false, HOLIDAY_MEMBER_CANNOT_DEACTIVATE);
                }
        }
-        elseif ($active == 'Y')
+        elseif ($active == "Y")
        {
                // To fast!
                LOAD_TEMPLATE("admin_settings_saved", false, HOLIDAY_MEMBER_LOCKED);
@@ -220,7 +205,7 @@ WHERE userid=%d LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
        SQL_FREERESULT($result);
 
        // Check for lock
-       if (($locked + $CONFIG['holiday_lock']) < time())
+       if (($locked + $_CONFIG['holiday_lock']) < time())
        {
                // User can deactivate his holiday request
                switch ($active)
@@ -252,7 +237,7 @@ WHERE userid=%d LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
                                $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data
 SET holiday_active='N'
 WHERE userid=%d LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
-                               LOAD_URL(URL."/modules.php?module=login&amp;what=holiday");
+                               LOAD_URL("modules.php?module=login&amp;what=holiday");
                                return;
                        }
                        break;
@@ -264,9 +249,9 @@ WHERE userid=%d LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
                        define('_START_YEAR' , ADD_SELECTION("year" , date('Y', (time() + ONE_DAY)), "start"));
 
                        // Calcualte ending date
-                       $D = date("d", time() + ONE_DAY + (ONE_DAY * $CONFIG['holiday_max']));
-                       $M = date("m", time() + ONE_DAY + (ONE_DAY * $CONFIG['holiday_max']));
-                       $Y = date('Y', time() + ONE_DAY + (ONE_DAY * $CONFIG['holiday_max']));
+                       $D = date("d", time() + ONE_DAY + (ONE_DAY * $_CONFIG['holiday_max']));
+                       $M = date("m", time() + ONE_DAY + (ONE_DAY * $_CONFIG['holiday_max']));
+                       $Y = date('Y', time() + ONE_DAY + (ONE_DAY * $_CONFIG['holiday_max']));
 
                        // Ending day
                        define('_END_DAY'  , ADD_SELECTION("day"  , $D, "end"));
@@ -274,7 +259,7 @@ WHERE userid=%d LIMIT 1", array($GLOBALS['userid']), __FILE__, __LINE__);
                        define('_END_YEAR' , ADD_SELECTION("year" , $Y, "end"));
 
                        // Copy value from configuration
-                       define('__HOLIDAY_MAX', $CONFIG['holiday_max']);
+                       define('__HOLIDAY_MAX', $_CONFIG['holiday_max']);
 
                        // Output form
                        LOAD_TEMPLATE("member_holiday_form");