Extension ext-earning introduced (unfinished), renamings:

[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 dd7c7a5731a09efe7ce123892af608a53e89301f..082004c4d91ed419d29acd4b82359270b35e2c77 100644 (file)
--- a/inc/modules/member/what-holiday.php
+++ b/inc/modules/member/what-holiday.php
@@ -86,8 +86,8 @@ if ((SQL_NUMROWS($result1) == 1) || (SQL_NUMROWS($result2) == 1)) {
 
        if ((($content['timestamp'] + getConfig('holiday_lock')) > time()) || (($content['timestamp_ordered'] + getConfig('holiday_lock')) > time())) {
                // Mail order is to close away!
-               unsetPostRequestParameter('ok');
-               unsetPostRequestParameter('stop');
+               unsetPostRequestElement('ok');
+               unsetPostRequestElement('stop');
 
                if (($content['timestamp'] + getConfig('holiday_lock')) > time()) {
                        // Mail found in pool
@@ -109,18 +109,18 @@ SQL_FREERESULT($result2);
 
 if (isFormSent()) {
        // Check holiday request...
-       $START = mktime(0, 0, 0, postRequestParameter('start_month'), postRequestParameter('start_day'), postRequestParameter('start_year'));
-       $content['holiday_end']   = mktime(0, 0, 0, postRequestParameter('end_month')  , postRequestParameter('end_day')  , postRequestParameter('end_year')  );
+       $START = mktime(0, 0, 0, postRequestElement('start_month'), postRequestElement('start_day'), postRequestElement('start_year'));
+       $content['holiday_end']   = mktime(0, 0, 0, postRequestElement('end_month')  , postRequestElement('end_day')  , postRequestElement('end_year')  );
 
        // Test both values
        $TEST = $content['holiday_end'] - $START;
        if (($TEST < 0) || ($TEST > (getOneDay() * getConfig('holiday_max'))) || ($START < time()) || ($content['holiday_end'] < time())) {
                // Time test failed
-               unsetPostRequestParameter('ok');
+               unsetPostRequestElement('ok');
        } 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(getMemberId(), $START, $content['holiday_end'], postRequestParameter('comments')), __FILE__, __LINE__);
+                       array(getMemberId(), $START, $content['holiday_end'], postRequestElement('comments')), __FILE__, __LINE__);
 
                // Activate holiday system
                SQL_QUERY_ESC("UPDATE
@@ -133,13 +133,13 @@ LIMIT 1",
                        array(getMemberId()), __FILE__, __LINE__);
 
                // Prepare constants
-               $content['start_day']   = bigintval(postRequestParameter('start_day'));
-               $content['start_month'] = $GLOBALS['month_descr'][postRequestParameter('start_month')];
-               $content['start_year']  = bigintval(postRequestParameter('start_year'));
-               $content['end_day']     = bigintval(postRequestParameter('end_day'));
-               $content['end_month']   = $GLOBALS['month_descr'][postRequestParameter('end_month')];
-               $content['end_year']    = bigintval(postRequestParameter('end_year'));
-               $content['comments']    = postRequestParameter('comments');
+               $content['start_day']   = bigintval(postRequestElement('start_day'));
+               $content['start_month'] = $GLOBALS['month_descr'][postRequestElement('start_month')];
+               $content['start_year']  = bigintval(postRequestElement('start_year'));
+               $content['end_day']     = bigintval(postRequestElement('end_day'));
+               $content['end_month']   = $GLOBALS['month_descr'][postRequestElement('end_month')];
+               $content['end_year']    = bigintval(postRequestElement('end_year'));
+               $content['comments']    = postRequestElement('comments');
 
                // Send mail to member
                $message = loadEmailTemplate('member_holiday_request', $content, getMemberId());
@@ -157,7 +157,7 @@ LIMIT 1",
 } // END - if
 
 // Holiday shall be ended now
-if (isPostRequestParameterSet('stop')) {
+if (isPostRequestElementSet('stop')) {
        // Okay, end the holiday here...
        $result = SQL_QUERY_ESC("SELECT
        `holiday_active`,`holiday_activated`
@@ -233,7 +233,7 @@ LIMIT 1",
 } // END - if
 
 // If something is wrong or link in menu is just clicked display form
-if ((!isFormSent()) && (!isPostRequestParameterSet('stop'))) {
+if ((!isFormSent()) && (!isPostRequestElementSet('stop'))) {
        // Check if user is in holiday...
        $result = SQL_QUERY_ESC("SELECT
        `holiday_active`,`holiday_activated`