Old config.php is now automatically updated to new config-local.php format, several...

[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 30863ddd6eaf5df03dde7862e3c6bef5e808b470..ec15bd331b3dd4dfcb51f5751b660ed174674fe3 100644 (file)
--- a/inc/modules/member/what-holiday.php
+++ b/inc/modules/member/what-holiday.php
@@ -101,13 +101,13 @@ if (IS_FORM_SENT()) {
        } else {
                // Everything went okay so let's store his request and send mails
                SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_user_holidays` (userid, holiday_start, holiday_end, comments) VALUES ('%s','%s','%s','%s')",
-                array(getUserId(), $START, $END, REQUEST_POST('comments')), __FILE__, __LINE__);
+               array(getUserId(), $START, $END, REQUEST_POST('comments')), __FILE__, __LINE__);
 
                // Activate holiday system
                SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data`
 SET `holiday_active`='N', holiday_activated=UNIX_TIMESTAMP()
 WHERE userid=%s LIMIT 1",
-                array(getUserId()), __FILE__, __LINE__);
+               array(getUserId()), __FILE__, __LINE__);
 
                // Prepare constants
                define('_START_DAY'  , REQUEST_POST('start_day'));
@@ -126,7 +126,7 @@ WHERE userid=%s LIMIT 1",
 
                // Create task
                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','{--HOLIDAY_ADMIN_SUBJECT--}','%s', UNIX_TIMESTAMP())",
-                       array(getUserId(), $msg), __FILE__, __LINE__);
+               array(getUserId(), $msg), __FILE__, __LINE__);
 
                // Display message
                LOAD_TEMPLATE('admin_settings_saved', false, getMessage('HOLIDAY_IS_ACTIVATED_NOW'));
@@ -134,7 +134,7 @@ WHERE userid=%s LIMIT 1",
 }
 
 // Holiday shall be ended now
-if (REQUEST_ISSET_POST(('stop'))) {
+if (REQUEST_ISSET_POST('stop')) {
        // Okay, end the holiday here...
        $result = SQL_QUERY_ESC("SELECT holiday_active, holiday_activated FROM `{!_MYSQL_PREFIX!}_user_data`
 WHERE userid=%s LIMIT 1", array(getUserId()), __FILE__, __LINE__);
@@ -179,7 +179,7 @@ WHERE userid=%s LIMIT 1", array(getUserId()), __FILE__, __LINE__);
 }
 
 // If something is wrong or link in menu is just clicked display form
-if ((!IS_FORM_SENT()) && (!REQUEST_ISSET_POST(('stop'))) {
+if ((!IS_FORM_SENT()) && (!REQUEST_ISSET_POST('stop'))) {
        // Check if user is in holiday...
        $result = SQL_QUERY_ESC("SELECT holiday_active, holiday_activated FROM `{!_MYSQL_PREFIX!}_user_data`
 WHERE userid=%s LIMIT 1", array(getUserId()), __FILE__, __LINE__);
@@ -191,57 +191,57 @@ WHERE userid=%s LIMIT 1", array(getUserId()), __FILE__, __LINE__);
                // User can deactivate his holiday request
                switch ($active)
                {
-               case 'Y': // Display deactivation form
-                       // Load starting and ending date
-                       $result = SQL_QUERY_ESC("SELECT holiday_start, holiday_end FROM `{!_MYSQL_PREFIX!}_user_holidays`
+                       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__);
-                       if (SQL_NUMROWS($result) == 1) {
-                               // Data was found
-                               list($start, $end) = SQL_FETCHROW($result);
-                               SQL_FREERESULT($result);
-
-                               // Prepare it for the template
-                               define('__HOLIDAY_START', generateDateTime($start , '3'));
-                               define('__HOLIDAY_END'  , generateDateTime($end   , '3'));
-                               define('__HOLIDAY_LOCK' , generateDateTime($locked, '1'));
-
-                               // Load template
-                               LOAD_TEMPLATE('member_holiday_deactivate');
-                       } else {
-                               // Free memory
-                               SQL_FREERESULT($result);
-
-                               // Remove entry and reload URL
-                               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data`
+                               if (SQL_NUMROWS($result) == 1) {
+                                       // Data was found
+                                       list($start, $end) = SQL_FETCHROW($result);
+                                       SQL_FREERESULT($result);
+
+                                       // Prepare it for the template
+                                       define('__HOLIDAY_START', generateDateTime($start , '3'));
+                                       define('__HOLIDAY_END'  , generateDateTime($end   , '3'));
+                                       define('__HOLIDAY_LOCK' , generateDateTime($locked, '1'));
+
+                                       // Load template
+                                       LOAD_TEMPLATE('member_holiday_deactivate');
+                               } else {
+                                       // Free memory
+                                       SQL_FREERESULT($result);
+
+                                       // Remove entry and reload URL
+                                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data`
 SET `holiday_active`='N'
 WHERE userid=%s LIMIT 1", array(getUserId()), __FILE__, __LINE__);
-                               redirectToUrl('modules.php?module=login&what=holiday');
-                               return;
-                       }
-                       break;
-
-               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'));
-                       define('_START_YEAR' , ADD_SELECTION('year' , date('Y', (time() + getConfig('one_day'))), 'start'));
-
-                       // Calcualte ending date
-                       $D = date('d', time() + getConfig('one_day') + (getConfig('one_day') * getConfig('holiday_max')));
-                       $M = date('m', time() + getConfig('one_day') + (getConfig('one_day') * getConfig('holiday_max')));
-                       $Y = date('Y', time() + getConfig('one_day') + (getConfig('one_day') * getConfig('holiday_max')));
-
-                       // Ending day
-                       define('_END_DAY'  , ADD_SELECTION('day'  , $D, 'end'));
-                       define('_END_MONTH', ADD_SELECTION('month', $M, 'end'));
-                       define('_END_YEAR' , ADD_SELECTION('year' , $Y, 'end'));
-
-                       // Copy value from configuration
-                       define('__HOLIDAY_MAX', getConfig('holiday_max'));
-
-                       // Output form
-                       LOAD_TEMPLATE('member_holiday_form');
-                       break;
+                                       redirectToUrl('modules.php?module=login&what=holiday');
+                                       return;
+                               }
+                               break;
+
+                       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'));
+                               define('_START_YEAR' , ADD_SELECTION('year' , date('Y', (time() + getConfig('one_day'))), 'start'));
+
+                               // Calcualte ending date
+                               $D = date('d', time() + getConfig('one_day') + (getConfig('one_day') * getConfig('holiday_max')));
+                               $M = date('m', time() + getConfig('one_day') + (getConfig('one_day') * getConfig('holiday_max')));
+                               $Y = date('Y', time() + getConfig('one_day') + (getConfig('one_day') * getConfig('holiday_max')));
+
+                               // Ending day
+                               define('_END_DAY'  , ADD_SELECTION('day'  , $D, 'end'));
+                               define('_END_MONTH', ADD_SELECTION('month', $M, 'end'));
+                               define('_END_YEAR' , ADD_SELECTION('year' , $Y, 'end'));
+
+                               // Copy value from configuration
+                               define('__HOLIDAY_MAX', getConfig('holiday_max'));
+
+                               // Output form
+                               LOAD_TEMPLATE('member_holiday_form');
+                               break;
                }
        } else {
                // To fast!