Fix for fatal error and naming convention applied

diff --git a/doubler.php b/doubler.php
index 2492b995d610197cbf992ec398b1acfbac045377..783bf99288856ee53da7809ffae91356d78dee60 100644 (file)
--- a/doubler.php
+++ b/doubler.php
@@ -94,7 +94,7 @@ if (isInstalled()) {
        } // END - if
 
        // Begin with doubler script...
        } // END - if
 
        // Begin with doubler script...

-       if (IS_FORM_SENT()) {
+       if (isFormSent()) {

                // Secure points (so only integer/double values are allowed
                REQUEST_SET_POST('points', bigintval(REQUEST_POST('points')));
 
                // Secure points (so only integer/double values are allowed
                REQUEST_SET_POST('points', bigintval(REQUEST_POST('points')));
 

diff --git a/inc/functions.php b/inc/functions.php
index 637412fc66ae8626244eebb5df5c42150225fc59..66614abbb7ad6e4637240e26f250ed785d8e29be 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -1715,7 +1715,7 @@ function extractHostnameFromUrl (&$script) {
        $url = constant('SERVER_URL');
 
        // Is this URL valid?
        $url = constant('SERVER_URL');
 
        // Is this URL valid?

-       if (substr($script, 0, 7) == "http://") {
+       if (substr($script, 0, 7) == 'http://') {

                // Use the hostname from script URL as new hostname
                $url = substr($script, 7);
                $extract = explode('/', $url);
                // Use the hostname from script URL as new hostname
                $url = substr($script, 7);
                $extract = explode('/', $url);


@@ -1724,12 +1724,12 @@ function extractHostnameFromUrl (&$script) {
        } // END - if
 
        // Extract host name
        } // END - if
 
        // Extract host name

-       $host = str_replace("http://", '', $url);
+       $host = str_replace('http://', '', $url);

        if (ereg('/', $host)) $host = substr($host, 0, strpos($host, '/'));
 
        // Generate relative URL
        //* DEBUG: */ print("SCRIPT=".$script."<br />\n");
        if (ereg('/', $host)) $host = substr($host, 0, strpos($host, '/'));
 
        // Generate relative URL
        //* DEBUG: */ print("SCRIPT=".$script."<br />\n");

-       if (substr(strtolower($script), 0, 7) == "http://") {
+       if (substr(strtolower($script), 0, 7) == 'http://') {

                // But only if http:// is in front!
                $script = substr($script, (strlen($url) + 7));
        } elseif (substr(strtolower($script), 0, 8) == "https://") {
                // But only if http:// is in front!
                $script = substr($script, (strlen($url) + 7));
        } elseif (substr(strtolower($script), 0, 8) == "https://") {


@@ -1827,9 +1827,11 @@ function sendRawRequest ($host, $request) {
 
        // Open connection
        //* DEBUG: */ die("SCRIPT=".$script."<br />\n");
 
        // Open connection
        //* DEBUG: */ die("SCRIPT=".$script."<br />\n");

-       if ($useProxy) {
-               $fp = @fsockopen(COMPILE_CODE(getConfig('proxy_host')), getConfig('proxy_port'), $errno, $errdesc, 30);
+       if ($useProxy === true) {
+               // Connect to host through proxy connection
+               $fp = @fsockopen(COMPILE_CODE(getConfig('proxy_host')), bigintval(getConfig('proxy_port')), $errno, $errdesc, 30);

        } else {
        } else {

+               // Connect to host directly

                $fp = @fsockopen($host, 80, $errno, $errdesc, 30);
        }
 
                $fp = @fsockopen($host, 80, $errno, $errdesc, 30);
        }
 


@@ -1840,7 +1842,7 @@ function sendRawRequest ($host, $request) {
        } // END - if
 
        // Do we use proxy?
        } // END - if
 
        // Do we use proxy?

-       if ($useProxy) {
+       if ($useProxy === true) {

                // Generate CONNECT request header
                $proxyTunnel  = "CONNECT " . $host . ":80 HTTP/1.1" . getConfig('HTTP_EOL');
                $proxyTunnel .= "Host: " . $host . getConfig('HTTP_EOL');
                // Generate CONNECT request header
                $proxyTunnel  = "CONNECT " . $host . ":80 HTTP/1.1" . getConfig('HTTP_EOL');
                $proxyTunnel .= "Host: " . $host . getConfig('HTTP_EOL');


@@ -1848,7 +1850,7 @@ function sendRawRequest ($host, $request) {
                // Use login data to proxy? (username at least!)
                if (getConfig('proxy_username') != '') {
                        // Add it as well
                // Use login data to proxy? (username at least!)
                if (getConfig('proxy_username') != '') {
                        // Add it as well

-                       $encodedAuth = base64_encode(COMPILE_CODE(getConfig('proxy_username')).getConfig('ENCRYPT_SEPERATOR').COMPILE_CODE(getConfig('proxy_password')));
+                       $encodedAuth = base64_encode(COMPILE_CODE(getConfig('proxy_username')) . getConfig('ENCRYPT_SEPERATOR') . COMPILE_CODE(getConfig('proxy_password')));

                        $proxyTunnel .= "Proxy-Authorization: Basic " . $encodedAuth . getConfig('HTTP_EOL');
                } // END - if
 
                        $proxyTunnel .= "Proxy-Authorization: Basic " . $encodedAuth . getConfig('HTTP_EOL');
                } // END - if
 


@@ -1904,7 +1906,7 @@ function sendRawRequest ($host, $request) {
        //* DEBUG: */ print("<strong>Response:</strong><pre>".print_r($response, true)."</pre>");
 
        // Proxy agent found?
        //* DEBUG: */ print("<strong>Response:</strong><pre>".print_r($response, true)."</pre>");
 
        // Proxy agent found?

-       if ((substr(strtolower($response[0]), 0, 11) == 'proxy-agent') && ($useProxy)) {
+       if ((substr(strtolower($response[0]), 0, 11) == 'proxy-agent') && ($useProxy === true)) {

                // Proxy header detected, so remove two lines
                array_shift($response);
                array_shift($response);
                // Proxy header detected, so remove two lines
                array_shift($response);
                array_shift($response);

diff --git a/inc/libs/html_mail_functions.php b/inc/libs/html_mail_functions.php
index 491afda732da7485bc2221496ddfd2da5f163414..7071a163a422539888f5bab91dcae49cd34011f2 100644 (file)
--- a/inc/libs/html_mail_functions.php
+++ b/inc/libs/html_mail_functions.php
@@ -72,22 +72,20 @@ function HTML_INSERT_URLS ($text) {
        $test = $text;
 
        // First replace URLs...
        $test = $text;
 
        // First replace URLs...

-       while (ereg("http://", $test))
-       {
-               $check = substr($test, strpos($test, "http://")); $check2 = $check;
+       while (ereg('http://', $test)) {
+               $check = substr($test, strpos($test, 'http://')); $check2 = $check;

 
                // See ext-html.php if you want to add more URL ends...
 
                // See ext-html.php if you want to add more URL ends...

-               foreach ($GLOBALS['url_ends'] as $end)
-               {
+               foreach ($GLOBALS['url_ends'] as $end) {

                        if (ereg($end, $check)) $check = substr($check, 0, strpos($check, $end));
                        if (ereg($end, $check)) $check = substr($check, 0, strpos($check, $end));

-               }
+               } // END - foreach

 
                // Now replace the URL against anchor container and pray...
                $text = substr($text, 0, strpos($text, $check2))."<a href=\"".DEREFERER($check)."\" target=\"_blank\">".$check."</a>".substr($text, strpos($text, $check2) + strlen($check));
 
                // Finally remove the url from testing string (or we have a loop and maybe server overload!)
                $test = substr($test, strpos($test, $check) + strlen($check));
 
                // Now replace the URL against anchor container and pray...
                $text = substr($text, 0, strpos($text, $check2))."<a href=\"".DEREFERER($check)."\" target=\"_blank\">".$check."</a>".substr($text, strpos($text, $check2) + strlen($check));
 
                // Finally remove the url from testing string (or we have a loop and maybe server overload!)
                $test = substr($test, strpos($test, $check) + strlen($check));

-       }
+       } // END - while

 
        // Now do the (nearly) same thing with email addresses
        // but now we have the problem that email addresses didn't have
 
        // Now do the (nearly) same thing with email addresses
        // but now we have the problem that email addresses didn't have

diff --git a/inc/libs/newsletter_functions.php b/inc/libs/newsletter_functions.php
index 40a38a8311c14e2504db88b639b289de3d5035df..16a28db280747a41ebc2f4f1f259137342e97143 100644 (file)
--- a/inc/libs/newsletter_functions.php
+++ b/inc/libs/newsletter_functions.php
@@ -74,20 +74,20 @@ function NL_INSERT_URLS ($text) {
        $test = $text;
 
        // First replace URLs...
        $test = $text;
 
        // First replace URLs...

-       while (ereg("http://", $test)) {
-               $check = substr($test, strpos($test, "http://")); $check2 = $check;
+       while (ereg('http://', $test)) {
+               $check = substr($test, strpos($test, 'http://')); $check2 = $check;

 
                // See ext-html.php if you want to add more URL ends...
                foreach ($GLOBALS['url_ends'] as $end) {
                        if (ereg($end, $check)) $check = substr($check, 0, strpos($check, $end));
 
                // See ext-html.php if you want to add more URL ends...
                foreach ($GLOBALS['url_ends'] as $end) {
                        if (ereg($end, $check)) $check = substr($check, 0, strpos($check, $end));

-               }
+               } // END - foreach

 
                // Now replace the URL against anchor container and pray...
                $text = substr($text, 0, strpos($text, $check2)) . DEREFERER($check) . substr($text, strpos($text, $check2) + strlen($check));
 
                // Finally remove the url from testing string (or we have a loop and maybe server overload!)
                $test = substr($test, strpos($test, $check) + strlen($check));
 
                // Now replace the URL against anchor container and pray...
                $text = substr($text, 0, strpos($text, $check2)) . DEREFERER($check) . substr($text, strpos($text, $check2) + strlen($check));
 
                // Finally remove the url from testing string (or we have a loop and maybe server overload!)
                $test = substr($test, strpos($test, $check) + strlen($check));

-       }
+       } // END - while

 
        // Now do the (nearly) same thing with email addresses
        // but now we have the problem that email addresses didn't have
 
        // Now do the (nearly) same thing with email addresses
        // but now we have the problem that email addresses didn't have

diff --git a/inc/modules/admin.php b/inc/modules/admin.php
index c347fa817d6677ae05707b5126b51a4a479280a4..986c37892f0aeae727b22e5e99f5465a2c0c274a 100644 (file)
--- a/inc/modules/admin.php
+++ b/inc/modules/admin.php
@@ -54,11 +54,11 @@ $ret = 'init';
 // Is no admin registered?
 if (!isAdminRegistered()) {
        // Admin is not registered so we have to inform the user
 // Is no admin registered?
 if (!isAdminRegistered()) {
        // Admin is not registered so we have to inform the user

-       if ((IS_FORM_SENT()) && ((!REQUEST_ISSET_POST(('login'))) || (!REQUEST_ISSET_POST(('pass'))) || (strlen(REQUEST_POST('pass')) < 4))) {
+       if ((isFormSent()) && ((!REQUEST_ISSET_POST(('login'))) || (!REQUEST_ISSET_POST(('pass'))) || (strlen(REQUEST_POST('pass')) < 4))) {

                REQUEST_SET_POST('ok', '***');
        }
 
                REQUEST_SET_POST('ok', '***');
        }
 

-       if ((IS_FORM_SENT()) && (REQUEST_POST('ok') != '***')) {
+       if ((isFormSent()) && (REQUEST_POST('ok') != '***')) {

                // Hash the password with the old function because we are here in install mode
                $hashedPass = md5(REQUEST_POST('pass'));
 
                // Hash the password with the old function because we are here in install mode
                $hashedPass = md5(REQUEST_POST('pass'));
 


@@ -117,7 +117,7 @@ if (!isAdminRegistered()) {
                }
 
                // Yet-another notice-fix
                }
 
                // Yet-another notice-fix

-               if ((IS_FORM_SENT()) && (REQUEST_POST('ok') == '***')) {
+               if ((isFormSent()) && (REQUEST_POST('ok') == '***')) {

                        // No login entered?
                        if (!REQUEST_ISSET_POST(('login'))) $loginMessage = getMessage('ADMIN_NO_LOGIN');
 
                        // No login entered?
                        if (!REQUEST_ISSET_POST(('login'))) $loginMessage = getMessage('ADMIN_NO_LOGIN');
 


@@ -206,11 +206,11 @@ if (!isAdminRegistered()) {
        } // END - if
 
        // Check if the admin has submitted data or not
        } // END - if
 
        // Check if the admin has submitted data or not

-       if ((IS_FORM_SENT()) && ((!REQUEST_ISSET_POST(('login'))) || (!REQUEST_ISSET_POST(('pass'))) || (strlen(REQUEST_POST('pass')) < 4))) {
+       if ((isFormSent()) && ((!REQUEST_ISSET_POST(('login'))) || (!REQUEST_ISSET_POST(('pass'))) || (strlen(REQUEST_POST('pass')) < 4))) {

                REQUEST_SET_POST('ok', '***');
        } // END - if
 
                REQUEST_SET_POST('ok', '***');
        } // END - if
 

-       if ((IS_FORM_SENT()) && (REQUEST_POST('ok') != '***')) {
+       if ((isFormSent()) && (REQUEST_POST('ok') != '***')) {

                // All required data was entered so we check his account
                $ret = CHECK_ADMIN_LOGIN(REQUEST_POST('login'), REQUEST_POST('pass'));
 
                // All required data was entered so we check his account
                $ret = CHECK_ADMIN_LOGIN(REQUEST_POST('login'), REQUEST_POST('pass'));
 


@@ -262,7 +262,7 @@ if (!isAdminRegistered()) {
                        define('__LOGIN_VALUE', '');
                }
 
                        define('__LOGIN_VALUE', '');
                }
 

-               if (IS_FORM_SENT()) {
+               if (isFormSent()) {

                        // Set messages to zero
                        $loginMessage = ''; $passwdMessage = '';
 
                        // Set messages to zero
                        $loginMessage = ''; $passwdMessage = '';
 

diff --git a/inc/modules/admin/what-add_bank_package.php b/inc/modules/admin/what-add_bank_package.php
index e6851277c0b6005f95749de0ba30cbce93aa37ef..7eebf556a936768037f2cf280158d2c5ede1d5ee 100644 (file)
--- a/inc/modules/admin/what-add_bank_package.php
+++ b/inc/modules/admin/what-add_bank_package.php
@@ -46,7 +46,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 ADD_DESCR('admin', __FILE__);
 
 // Is the formular sent?
 ADD_DESCR('admin', __FILE__);
 
 // Is the formular sent?

-if (IS_FORM_SENT()) {
+if (isFormSent()) {

        // Save the row to the database
        ADMIN_SAVE_SETTINGS(REQUEST_POST_ARRAY(), "_bank_packages", '', array("account_fee", "interest_plus", "interest_minus", "first_payment"), true);
 } else {
        // Save the row to the database
        ADMIN_SAVE_SETTINGS(REQUEST_POST_ARRAY(), "_bank_packages", '', array("account_fee", "interest_plus", "interest_minus", "first_payment"), true);
 } else {

diff --git a/inc/modules/admin/what-add_guestnl_cat.php b/inc/modules/admin/what-add_guestnl_cat.php
index 3f30a405bd9ec6e29d159a2281e5be8e5d9bbe60..efdd811f68d7696ea5472f732716920f4e4b97e9 100644 (file)
--- a/inc/modules/admin/what-add_guestnl_cat.php
+++ b/inc/modules/admin/what-add_guestnl_cat.php
@@ -45,7 +45,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 // Add description as navigation point
 ADD_DESCR('admin', __FILE__);
 
 // Add description as navigation point
 ADD_DESCR('admin', __FILE__);
 

-if (IS_FORM_SENT()) {
+if (isFormSent()) {

        // Check if category does already exist
 } else {
        // Display form
        // Check if category does already exist
 } else {
        // Display form

diff --git a/inc/modules/admin/what-add_points.php b/inc/modules/admin/what-add_points.php
index 442720021aac27d5c4bca25476b6e6a37fee5956..1329e0ec52f765c1568741202de1258da1a9a02d 100644 (file)
--- a/inc/modules/admin/what-add_points.php
+++ b/inc/modules/admin/what-add_points.php
@@ -50,7 +50,7 @@ if (!REQUEST_ISSET_GET('uid')) REQUEST_SET_GET('uid', '');
 
 if (REQUEST_GET('uid') == "all") {
        // Add points to all accounts
 
 if (REQUEST_GET('uid') == "all") {
        // Add points to all accounts

-       if ((IS_FORM_SENT()) && (REQUEST_POST('points') > 0)) {
+       if ((isFormSent()) && (REQUEST_POST('points') > 0)) {

                // @TODO Rewrite this constant
                define('__POINTS_VALUE', REQUEST_POST('points'));
 
                // @TODO Rewrite this constant
                define('__POINTS_VALUE', REQUEST_POST('points'));
 


@@ -95,7 +95,7 @@ if (REQUEST_GET('uid') == "all") {
                list($sname, $fname, $email) = SQL_FETCHROW($result);
                SQL_FREERESULT($result);
 
                list($sname, $fname, $email) = SQL_FETCHROW($result);
                SQL_FREERESULT($result);
 

-               if ((IS_FORM_SENT()) && (REQUEST_ISSET_POST(('points')))) {
+               if ((isFormSent()) && (REQUEST_ISSET_POST(('points')))) {

                        // Remove depth to prevent booking errors. This is a bad coding
                        // practice, thats also why we need to write this project from
                        // scratch...
                        // Remove depth to prevent booking errors. This is a bad coding
                        // practice, thats also why we need to write this project from
                        // scratch...

diff --git a/inc/modules/admin/what-add_rallye.php b/inc/modules/admin/what-add_rallye.php
index 5d8ef99f762ef46161ec27265ac6bca40a129ccf..4ad03f5172bf75f83becae8061862985839c145b 100644 (file)
--- a/inc/modules/admin/what-add_rallye.php
+++ b/inc/modules/admin/what-add_rallye.php
@@ -45,30 +45,30 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 // Add description as navigation point
 ADD_DESCR('admin', __FILE__);
 
 // Add description as navigation point
 ADD_DESCR('admin', __FILE__);
 

-if (IS_FORM_SENT()) {
+if (isFormSent()) {

        // Generate timestamps
        $START = mktime(REQUEST_POST('start_hour'), REQUEST_POST('start_min'), REQUEST_POST('start_sec'), REQUEST_POST('start_month'), REQUEST_POST('start_day'), REQUEST_POST('start_year'));
        $END   = mktime(REQUEST_POST('end_hour')  , REQUEST_POST('end_min')  , REQUEST_POST('end_sec')  , REQUEST_POST('end_month')  , REQUEST_POST('end_day')  , REQUEST_POST('end_year')  );
 
        // Is there already a rallye running?
        $result = SQL_QUERY_ESC("SELECT id, admin_id FROM `{!_MYSQL_PREFIX!}_rallye_data` WHERE (start_time <= %s AND end_time >= %s) OR (start_time >= %s AND start_time <= %s) LIMIT 1",
        // Generate timestamps
        $START = mktime(REQUEST_POST('start_hour'), REQUEST_POST('start_min'), REQUEST_POST('start_sec'), REQUEST_POST('start_month'), REQUEST_POST('start_day'), REQUEST_POST('start_year'));
        $END   = mktime(REQUEST_POST('end_hour')  , REQUEST_POST('end_min')  , REQUEST_POST('end_sec')  , REQUEST_POST('end_month')  , REQUEST_POST('end_day')  , REQUEST_POST('end_year')  );
 
        // Is there already a rallye running?
        $result = SQL_QUERY_ESC("SELECT id, admin_id FROM `{!_MYSQL_PREFIX!}_rallye_data` WHERE (start_time <= %s AND end_time >= %s) OR (start_time >= %s AND start_time <= %s) LIMIT 1",

-       array($START, $START, $START, $END), __FILE__, __LINE__);
+               array($START, $START, $START, $END), __FILE__, __LINE__);

 
        if (SQL_NUMROWS($result) == 0) {
                // Ok, start and end time did not overlap
                SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_rallye_data` (admin_id, title, descr, template, start_time, end_time, auto_add_new_user, is_active, send_notify)
 VALUES ('%s','%s','%s','%s','%s','%s','%s','%s','%s')",
 
        if (SQL_NUMROWS($result) == 0) {
                // Ok, start and end time did not overlap
                SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_rallye_data` (admin_id, title, descr, template, start_time, end_time, auto_add_new_user, is_active, send_notify)
 VALUES ('%s','%s','%s','%s','%s','%s','%s','%s','%s')",

-               array(
-               getCurrentAdminId(),
-               REQUEST_POST('title'),
-               REQUEST_POST('descr'),
-               REQUEST_POST('template'),
-               $START,
-               $END,
-               REQUEST_POST('auto_add'),
-               REQUEST_POST('active'),
-               REQUEST_POST('notify'),
-               ), __FILE__, __LINE__);
+                       array(
+                               getCurrentAdminId(),
+                               REQUEST_POST('title'),
+                               REQUEST_POST('descr'),
+                               REQUEST_POST('template'),
+                               $START,
+                               $END,
+                               REQUEST_POST('auto_add'),
+                               REQUEST_POST('active'),
+                               REQUEST_POST('notify'),
+                       ), __FILE__, __LINE__);

 
                // Load ID
                $result = SQL_QUERY_ESC("SELECT `id` FROM `{!_MYSQL_PREFIX!}_rallye_data` WHERE start_time='%s' AND end_time='%s' AND `title`='%s' LIMIT 1",
 
                // Load ID
                $result = SQL_QUERY_ESC("SELECT `id` FROM `{!_MYSQL_PREFIX!}_rallye_data` WHERE start_time='%s' AND end_time='%s' AND `title`='%s' LIMIT 1",

diff --git a/inc/modules/admin/what-add_sponsor.php b/inc/modules/admin/what-add_sponsor.php
index df69c723aa6800890a8f9618e2cb5a581f0554f0..4254a691b94f38377d8781d971846b380ee7932d 100644 (file)
--- a/inc/modules/admin/what-add_sponsor.php
+++ b/inc/modules/admin/what-add_sponsor.php
@@ -45,7 +45,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 // Add description as navigation point
 ADD_DESCR('admin', __FILE__);
 
 // Add description as navigation point
 ADD_DESCR('admin', __FILE__);
 

-if (IS_FORM_SENT()) {
+if (isFormSent()) {

        // Save sponsor in database
        SPONSOR_HANDLE_SPONSOR(REQUEST_POST_ARRAY());
 } else {
        // Save sponsor in database
        SPONSOR_HANDLE_SPONSOR(REQUEST_POST_ARRAY());
 } else {

diff --git a/inc/modules/admin/what-admin_add.php b/inc/modules/admin/what-admin_add.php
index 3bb45b511fb9d34631daad763e20755fbb7eebb3..18a9dcfdeeb81cc4ac94964359ca10cf7a652ce9 100644 (file)
--- a/inc/modules/admin/what-admin_add.php
+++ b/inc/modules/admin/what-admin_add.php
@@ -46,11 +46,11 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 ADD_DESCR('admin', __FILE__);
 
 // Check if the admin has entered title and what-php file name...
 ADD_DESCR('admin', __FILE__);
 
 // Check if the admin has entered title and what-php file name...

-if (((!REQUEST_ISSET_POST(('title'))) || (!REQUEST_ISSET_POST(('menu'))) || (!REQUEST_ISSET_POST(('descr')))) && (IS_FORM_SENT())) {
+if (((!REQUEST_ISSET_POST(('title'))) || (!REQUEST_ISSET_POST(('menu'))) || (!REQUEST_ISSET_POST(('descr')))) && (isFormSent())) {

        REQUEST_UNSET_POST('ok');
 }
 
        REQUEST_UNSET_POST('ok');
 }
 

-if (!IS_FORM_SENT())
+if (!isFormSent())

 {
        // Create arrays
        $menus = array(); $titles = array(); $below = array();
 {
        // Create arrays
        $menus = array(); $titles = array(); $below = array();

diff --git a/inc/modules/admin/what-adminedit.php b/inc/modules/admin/what-adminedit.php
index 19af03ec6d25286e9987319ba5ac6e590c4cb076..f5743113d5bb30a99e885bb65a90cacafb7d7466 100644 (file)
--- a/inc/modules/admin/what-adminedit.php
+++ b/inc/modules/admin/what-adminedit.php
@@ -151,7 +151,7 @@ elseif ((REQUEST_ISSET_POST('del')) && (!IS_DEMO()))
 
        // Load template
        LOAD_TEMPLATE("admin_amenu_delete");
 
        // Load template
        LOAD_TEMPLATE("admin_amenu_delete");

-} elseif ((IS_FORM_SENT()) && (!IS_DEMO())) {
+} elseif ((isFormSent()) && (!IS_DEMO())) {

        // An action is done...
        switch (REQUEST_POST('ok'))
        {
        // An action is done...
        switch (REQUEST_POST('ok'))
        {

diff --git a/inc/modules/admin/what-admins_contct.php b/inc/modules/admin/what-admins_contct.php
index 5b99c28e67b9d0c217608f0fb17a0364ace404f6..654481c992d083153c42b2e967da520b3ef5e37b 100644 (file)
--- a/inc/modules/admin/what-admins_contct.php
+++ b/inc/modules/admin/what-admins_contct.php
@@ -45,7 +45,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 // Add description as navigation point
 ADD_DESCR('admin', __FILE__);
 
 // Add description as navigation point
 ADD_DESCR('admin', __FILE__);
 

-if ((IS_FORM_SENT()) && (REQUEST_ISSET_GET('admin'))) {
+if ((isFormSent()) && (REQUEST_ISSET_GET('admin'))) {

        // Send mail or message
        if ((EXT_IS_ACTIVE("msg")) && (REQUEST_POST('type') == "msg")) {
                // Add message
        // Send mail or message
        if ((EXT_IS_ACTIVE("msg")) && (REQUEST_POST('type') == "msg")) {
                // Add message

diff --git a/inc/modules/admin/what-config_active.php b/inc/modules/admin/what-config_active.php
index e6dffcbeb3fa85292d8d86409643004959110a40..326f91f7b0fff2136ee4af9003d814d020a4b66e 100644 (file)
--- a/inc/modules/admin/what-config_active.php
+++ b/inc/modules/admin/what-config_active.php
@@ -45,7 +45,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 // Add description as navigation point
 ADD_DESCR('admin', __FILE__);
 
 // Add description as navigation point
 ADD_DESCR('admin', __FILE__);
 

-if (IS_FORM_SENT()) {
+if (isFormSent()) {

        // Save data
        ADMIN_SAVE_SETTINGS_POST();
 } else {
        // Save data
        ADMIN_SAVE_SETTINGS_POST();
 } else {

diff --git a/inc/modules/admin/what-config_admin.php b/inc/modules/admin/what-config_admin.php
index 4d78ddb8c6fbd7d8feb6e48e5337ae6ba2f5e45b..9c7eb830f1e1e68137a1e36b6f0fcf3535437535 100644 (file)
--- a/inc/modules/admin/what-config_admin.php
+++ b/inc/modules/admin/what-config_admin.php
@@ -44,7 +44,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 // Add description as navigation point
 ADD_DESCR('admin', __FILE__);
 
 // Add description as navigation point
 ADD_DESCR('admin', __FILE__);
 

-if (IS_FORM_SENT()) {
+if (isFormSent()) {

        // Save configuration
        ADMIN_SAVE_SETTINGS_POST();
 } else {
        // Save configuration
        ADMIN_SAVE_SETTINGS_POST();
 } else {

diff --git a/inc/modules/admin/what-config_autopurge.php b/inc/modules/admin/what-config_autopurge.php
index 77ae1fa39ead86ff6c3582992b618e52b803f6db..f0f27c04358b2cd0d97606f9b2f8eb7379520c18 100644 (file)
--- a/inc/modules/admin/what-config_autopurge.php
+++ b/inc/modules/admin/what-config_autopurge.php
@@ -45,7 +45,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 // Add description as navigation point
 ADD_DESCR('admin', __FILE__);
 
 // Add description as navigation point
 ADD_DESCR('admin', __FILE__);
 

-if (IS_FORM_SENT()) {
+if (isFormSent()) {

        // Data was submitted so we store it
        ADMIN_SAVE_SETTINGS_POST();
 } else {
        // Data was submitted so we store it
        ADMIN_SAVE_SETTINGS_POST();
 } else {

diff --git a/inc/modules/admin/what-config_beg.php b/inc/modules/admin/what-config_beg.php
index 516538aaafa8427b866f542f47e2d79152a36351..7148c1bae4963bc09a090aa2460bfb3297557c44 100644 (file)
--- a/inc/modules/admin/what-config_beg.php
+++ b/inc/modules/admin/what-config_beg.php
@@ -45,7 +45,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 // Add description as navigation point
 ADD_DESCR('admin', __FILE__);
 
 // Add description as navigation point
 ADD_DESCR('admin', __FILE__);
 

-if (IS_FORM_SENT()) {
+if (isFormSent()) {

        // Translate german decimal commas to computer decimal dots
        REQUEST_SET_POST('beg_points'      , convertCommaToDot(REQUEST_POST('beg_points')      ));
        REQUEST_SET_POST('beg_points_max'  , convertCommaToDot(REQUEST_POST('beg_points_max')  ));
        // Translate german decimal commas to computer decimal dots
        REQUEST_SET_POST('beg_points'      , convertCommaToDot(REQUEST_POST('beg_points')      ));
        REQUEST_SET_POST('beg_points_max'  , convertCommaToDot(REQUEST_POST('beg_points_max')  ));

diff --git a/inc/modules/admin/what-config_birthday.php b/inc/modules/admin/what-config_birthday.php
index f614f54e10e3612373c928976c45773fb88c139d..257106d884d62d6884e7e6ab7f051711ff3e1bc5 100644 (file)
--- a/inc/modules/admin/what-config_birthday.php
+++ b/inc/modules/admin/what-config_birthday.php
@@ -45,7 +45,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 // Add description as navigation point
 ADD_DESCR('admin', __FILE__);
 
 // Add description as navigation point
 ADD_DESCR('admin', __FILE__);
 

-if (IS_FORM_SENT()) {
+if (isFormSent()) {

        // Save configuration
        ADMIN_SAVE_SETTINGS_POST();
 } else {
        // Save configuration
        ADMIN_SAVE_SETTINGS_POST();
 } else {

diff --git a/inc/modules/admin/what-config_bonus.php b/inc/modules/admin/what-config_bonus.php
index d5d8a09f1d580d45d3381c23d7175751952ad9b5..84912169d5cc332df93dc0aaa7e708401fc47be0 100644 (file)
--- a/inc/modules/admin/what-config_bonus.php
+++ b/inc/modules/admin/what-config_bonus.php
@@ -45,12 +45,12 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 // Add description as navigation point
 ADD_DESCR('admin', __FILE__);
 
 // Add description as navigation point
 ADD_DESCR('admin', __FILE__);
 

-if (IS_FORM_SENT()) {
+if (isFormSent()) {

        // Replace german decimal commas to computer decimal dots
        // Replace german decimal commas to computer decimal dots

-       REQUEST_POST('login_bonus')         = convertCommaToDot(REQUEST_POST('login_bonus')        );
-       REQUEST_POST('turbo_bonus')         = convertCommaToDot(REQUEST_POST('turbo_bonus')        );
-       REQUEST_POST('bonus_ref')           = convertCommaToDot(REQUEST_POST('bonus_ref')          );
-       REQUEST_POST('bonus_order')         = convertCommaToDot(REQUEST_POST('bonus_order')        );
+       REQUEST_SET_POST('login_bonus',         convertCommaToDot(REQUEST_POST('login_bonus')));
+       REQUEST_SET_POST('turbo_bonus',         convertCommaToDot(REQUEST_POST('turbo_bonus')));
+       REQUEST_SET_POST('bonus_ref',           convertCommaToDot(REQUEST_POST('bonus_ref')));
+       REQUEST_SET_POST('bonus_order',         convertCommaToDot(REQUEST_POST('bonus_order')));

        REQUEST_SET_POST('bonus_notify_points', convertCommaToDot(REQUEST_POST('bonus_notify_points')));
 
        // Generate string for saving ranks
        REQUEST_SET_POST('bonus_notify_points', convertCommaToDot(REQUEST_POST('bonus_notify_points')));
 
        // Generate string for saving ranks

diff --git a/inc/modules/admin/what-config_cache.php b/inc/modules/admin/what-config_cache.php
index 86d588a7d4220ddfcb3b9e68135f0821b7b53dcc..59a6723c89a176aa1c2da3f511f54ae4f3b7b719 100644 (file)
--- a/inc/modules/admin/what-config_cache.php
+++ b/inc/modules/admin/what-config_cache.php
@@ -45,7 +45,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 // Add description as navigation point
 ADD_DESCR('admin', __FILE__);
 
 // Add description as navigation point
 ADD_DESCR('admin', __FILE__);
 

-if (IS_FORM_SENT()) {
+if (isFormSent()) {

        // Cache path has been not changed by default so don't test it again
        REQUEST_SET_POST('cache_tested', 'N');
 
        // Cache path has been not changed by default so don't test it again
        REQUEST_SET_POST('cache_tested', 'N');
 

diff --git a/inc/modules/admin/what-config_cats.php b/inc/modules/admin/what-config_cats.php
index 7132bfe2392049b2038fe82ec513d68d013a46d6..42e35ff3d078788c0cadbb0212f17c50fa180797 100644 (file)
--- a/inc/modules/admin/what-config_cats.php
+++ b/inc/modules/admin/what-config_cats.php
@@ -68,7 +68,7 @@ if (REQUEST_ISSET_POST(('add'))) {
 
        // Display message
        LOAD_TEMPLATE('admin_settings_saved', false, $content);
 
        // Display message
        LOAD_TEMPLATE('admin_settings_saved', false, $content);

-} elseif ((IS_FORM_SENT()) && (REQUEST_ISSET_POST('id')) && (is_array(REQUEST_POST('id')))) {
+} elseif ((isFormSent()) && (REQUEST_ISSET_POST('id')) && (is_array(REQUEST_POST('id')))) {

        // Change or delete categories...
        $TEXT = '';
        foreach (REQUEST_POST('id') as $id => $cat) {
        // Change or delete categories...
        $TEXT = '';
        foreach (REQUEST_POST('id') as $id => $cat) {

diff --git a/inc/modules/admin/what-config_doubler.php b/inc/modules/admin/what-config_doubler.php
index db841a13eabd12d4b28a85a6b84daf8cc50423fb..bd1bb4c49c2d2e74400e68df55a0f7bd9656ab64 100644 (file)
--- a/inc/modules/admin/what-config_doubler.php
+++ b/inc/modules/admin/what-config_doubler.php
@@ -45,7 +45,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 // Add description as navigation point
 ADD_DESCR('admin', __FILE__);
 
 // Add description as navigation point
 ADD_DESCR('admin', __FILE__);
 

-if (IS_FORM_SENT()) {
+if (isFormSent()) {

        // Replace commata with decimal dot
        REQUEST_SET_POST('doubler_charge', convertCommaToDot((REQUEST_POST('doubler_charge') / 100)));
        REQUEST_SET_POST('doubler_ref'   , convertCommaToDot((REQUEST_POST('doubler_ref') / 100)));
        // Replace commata with decimal dot
        REQUEST_SET_POST('doubler_charge', convertCommaToDot((REQUEST_POST('doubler_charge') / 100)));
        REQUEST_SET_POST('doubler_ref'   , convertCommaToDot((REQUEST_POST('doubler_ref') / 100)));

diff --git a/inc/modules/admin/what-config_email.php b/inc/modules/admin/what-config_email.php
index 1771aa54dfea63fcfe8d907691e4e72487f2d7d8..5d7c6094ba2059b31aac2bbd7310f6573fa874d6 100644 (file)
--- a/inc/modules/admin/what-config_email.php
+++ b/inc/modules/admin/what-config_email.php
@@ -67,7 +67,7 @@ if (REQUEST_ISSET_POST(('add_max'))) {
 
        // Display message
        LOAD_TEMPLATE('admin_settings_saved', false, $content);
 
        // Display message
        LOAD_TEMPLATE('admin_settings_saved', false, $content);

-} elseif ((IS_FORM_SENT()) && (REQUEST_ISSET_GET('do'))) {
+} elseif ((isFormSent()) && (REQUEST_ISSET_GET('do'))) {

        // Change or delete entries...
        $TEXT = '';
        foreach (REQUEST_POST('id') as $id => $value) {
        // Change or delete entries...
        $TEXT = '';
        foreach (REQUEST_POST('id') as $id => $value) {

diff --git a/inc/modules/admin/what-config_extensions.php b/inc/modules/admin/what-config_extensions.php
index bd1d4e2605f8f275520679cfa9b0b762b3698dd4..cc3ba11687bd131ea69b0e4ea198ba1421443fef 100644 (file)
--- a/inc/modules/admin/what-config_extensions.php
+++ b/inc/modules/admin/what-config_extensions.php
@@ -45,7 +45,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 // Add description as navigation point
 ADD_DESCR('admin', __FILE__);
 
 // Add description as navigation point
 ADD_DESCR('admin', __FILE__);
 

-if (IS_FORM_SENT()) {
+if (isFormSent()) {

        // Save configuration
        ADMIN_SAVE_SETTINGS_POST();
 } else {
        // Save configuration
        ADMIN_SAVE_SETTINGS_POST();
 } else {

diff --git a/inc/modules/admin/what-config_holiday.php b/inc/modules/admin/what-config_holiday.php
index 07ac413f57474368f13ffb1e7dc6fb19edfb8405..21d9a2798fadf59986ce53733cde27fc0d6316f4 100644 (file)
--- a/inc/modules/admin/what-config_holiday.php
+++ b/inc/modules/admin/what-config_holiday.php
@@ -45,13 +45,10 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 // Add description as navigation point
 ADD_DESCR('admin', __FILE__);
 
 // Add description as navigation point
 ADD_DESCR('admin', __FILE__);
 

-if (IS_FORM_SENT())
-{
+if (isFormSent()) {

        // Save settings
        ADMIN_SAVE_SETTINGS_POST();
        // Save settings
        ADMIN_SAVE_SETTINGS_POST();

-}
-else
-{
+} else {

        // Prepare constants for the template
        define('__MAX_VALUE', getConfig('holiday_max'));
        define('__LOCKED'   , createTimeSelections(getConfig('holiday_lock')  , "holiday_lock"  , "WDh"));
        // Prepare constants for the template
        define('__MAX_VALUE', getConfig('holiday_max'));
        define('__LOCKED'   , createTimeSelections(getConfig('holiday_lock')  , "holiday_lock"  , "WDh"));


@@ -71,5 +68,6 @@ else
        // Load form template
        LOAD_TEMPLATE("admin_config_holiday");
 }
        // Load form template
        LOAD_TEMPLATE("admin_config_holiday");
 }

+

 //
 ?>
 //
 ?>

diff --git a/inc/modules/admin/what-config_home.php b/inc/modules/admin/what-config_home.php
index 294d0ffff0740fdb1664448379780867c4c78814..ff50839192804d83acc383366ac5b080735efe03 100644 (file)
--- a/inc/modules/admin/what-config_home.php
+++ b/inc/modules/admin/what-config_home.php
@@ -52,7 +52,7 @@ if (REQUEST_ISSET_GET('sub')) $sub = REQUEST_GET('sub');
 switch ($sub)
 {
        case "settings": // Settings related to the index page
 switch ($sub)
 {
        case "settings": // Settings related to the index page

-               if (IS_FORM_SENT()) {
+               if (isFormSent()) {

                        // Save settings
                        ADMIN_SAVE_SETTINGS_POST();
                        OUTPUT_HTML("<a href=\"{!URL!}/modules.php?module=admin&amp;what=config_home&amp;sub=settings\">{--ADMIN_CONTINUE_TO_CONFIG--}</a>");
                        // Save settings
                        ADMIN_SAVE_SETTINGS_POST();
                        OUTPUT_HTML("<a href=\"{!URL!}/modules.php?module=admin&amp;what=config_home&amp;sub=settings\">{--ADMIN_CONTINUE_TO_CONFIG--}</a>");

diff --git a/inc/modules/admin/what-config_mediadata.php b/inc/modules/admin/what-config_mediadata.php
index 05c1482eea9819d8a52c9a5c74878962b1e8d033..7b1ce5e2efd16d709e04aa3464fef5bb48ab4a7f 100644 (file)
--- a/inc/modules/admin/what-config_mediadata.php
+++ b/inc/modules/admin/what-config_mediadata.php
@@ -45,7 +45,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 // Add description as navigation point
 ADD_DESCR('admin', __FILE__);
 
 // Add description as navigation point
 ADD_DESCR('admin', __FILE__);
 

-if (IS_FORM_SENT()) {
+if (isFormSent()) {

        // Test timestamp
        $STAMP = mktime(0, 0, 0, bigintval(REQUEST_POST('month')), bigintval(REQUEST_POST('day')), bigintval(REQUEST_POST('year')));
        if ($STAMP > time()) {
        // Test timestamp
        $STAMP = mktime(0, 0, 0, bigintval(REQUEST_POST('month')), bigintval(REQUEST_POST('day')), bigintval(REQUEST_POST('year')));
        if ($STAMP > time()) {


@@ -69,7 +69,7 @@ if (IS_FORM_SENT()) {
        }
 }
 
        }
 }
 

-if (IS_FORM_SENT()) {
+if (isFormSent()) {

        // Save data
        ADMIN_SAVE_SETTINGS_POST();
 } else {
        // Save data
        ADMIN_SAVE_SETTINGS_POST();
 } else {

diff --git a/inc/modules/admin/what-config_newsletter.php b/inc/modules/admin/what-config_newsletter.php
index 54d47057d4c1103fa2c670c4aef311781f817537..ed72a5e6676a6b904b8a3f7b82a66045603b37ca 100644 (file)
--- a/inc/modules/admin/what-config_newsletter.php
+++ b/inc/modules/admin/what-config_newsletter.php
@@ -45,7 +45,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 // Add description as navigation point
 ADD_DESCR('admin', __FILE__);
 
 // Add description as navigation point
 ADD_DESCR('admin', __FILE__);
 

-if (IS_FORM_SENT()) {
+if (isFormSent()) {

        // Save data
        REQUEST_SET_POST('nl_charge', convertCommaToDot(REQUEST_POST('nl_charge')));
 
        // Save data
        REQUEST_SET_POST('nl_charge', convertCommaToDot(REQUEST_POST('nl_charge')));
 

diff --git a/inc/modules/admin/what-config_nickname.php b/inc/modules/admin/what-config_nickname.php
index 6b7393056ab0fb8f6d3a1526d29913b06c510224..35e56fcc1b1f250baa2541a3cecc79cf309e1c9f 100644 (file)
--- a/inc/modules/admin/what-config_nickname.php
+++ b/inc/modules/admin/what-config_nickname.php
@@ -45,7 +45,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 // Add description as navigation point
 ADD_DESCR('admin', __FILE__);
 
 // Add description as navigation point
 ADD_DESCR('admin', __FILE__);
 

-if (IS_FORM_SENT()) {
+if (isFormSent()) {

        // Save data
        ADMIN_SAVE_SETTINGS_POST();
 } else {
        // Save data
        ADMIN_SAVE_SETTINGS_POST();
 } else {

diff --git a/inc/modules/admin/what-config_order.php b/inc/modules/admin/what-config_order.php
index 3bf7eed2470cbfb1f46900b48e06589a23ab9381..03a1d0dad0f9b464dd605eec922810508d19ce70 100644 (file)
--- a/inc/modules/admin/what-config_order.php
+++ b/inc/modules/admin/what-config_order.php
@@ -45,13 +45,12 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 // Add description as navigation point
 ADD_DESCR('admin', __FILE__);
 
 // Add description as navigation point
 ADD_DESCR('admin', __FILE__);
 

-if (IS_FORM_SENT()) {
+if (isFormSent()) {

        // Save data
        ADMIN_SAVE_SETTINGS_POST();
 } else {
        // Prepare constants for the template
        // Save data
        ADMIN_SAVE_SETTINGS_POST();
 } else {
        // Prepare constants for the template

-       switch (getConfig('order_max_full'))
-       {
+       switch (getConfig('order_max_full')) {

                case 'ORDER':
                        define('__ORDER_DEFAULT', ' checked="checked"');
                        define('__MAX_DEFAULT'  , '');
                case 'ORDER':
                        define('__ORDER_DEFAULT', ' checked="checked"');
                        define('__MAX_DEFAULT'  , '');


@@ -67,8 +66,7 @@ if (IS_FORM_SENT()) {
        define('__MIN_VALUE', getConfig('order_min'));
 
        // Sorting mode (ascending / descending)
        define('__MIN_VALUE', getConfig('order_min'));
 
        // Sorting mode (ascending / descending)

-       switch (getConfig('order_mode'))
-       {
+       switch (getConfig('order_mode')) {

                case "ASC":
                        define('__ASC_DEFAULT' , ' selected="selected"');
                        define('__DESC_DEFAULT', '');
                case "ASC":
                        define('__ASC_DEFAULT' , ' selected="selected"');
                        define('__DESC_DEFAULT', '');


@@ -134,5 +132,6 @@ if (IS_FORM_SENT()) {
        // Load template
        LOAD_TEMPLATE("admin_config_order");
 }
        // Load template
        LOAD_TEMPLATE("admin_config_order");
 }

+

 //
 ?>
 //
 ?>

diff --git a/inc/modules/admin/what-config_other.php b/inc/modules/admin/what-config_other.php
index b333ac5b513de641d893f0f08d16011cf483ec09..2074ae482807cf6e37414259bb60f707b4381eaf 100644 (file)
--- a/inc/modules/admin/what-config_other.php
+++ b/inc/modules/admin/what-config_other.php
@@ -50,7 +50,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 ADD_DESCR('admin', __FILE__);
 
 // Stop saving data if one input field is !isset
 ADD_DESCR('admin', __FILE__);
 
 // Stop saving data if one input field is !isset

-if (IS_FORM_SENT()) {
+if (isFormSent()) {

        // Calculate stamps and set calculated stamps
        REQUEST_POST('online_timeout')        = createTimestampFromSelections('ip_timeout'           , REQUEST_POST_ARRAY());
        REQUEST_POST('url_tlock')             = createTimestampFromSelections('url_tlock'            , REQUEST_POST_ARRAY());
        // Calculate stamps and set calculated stamps
        REQUEST_POST('online_timeout')        = createTimestampFromSelections('ip_timeout'           , REQUEST_POST_ARRAY());
        REQUEST_POST('url_tlock')             = createTimestampFromSelections('url_tlock'            , REQUEST_POST_ARRAY());


@@ -73,7 +73,7 @@ if (IS_FORM_SENT()) {
        if (!REQUEST_ISSET_POST(('reject_url')))            { REQUEST_UNSET_POST('ok'); }
 }
 
        if (!REQUEST_ISSET_POST(('reject_url')))            { REQUEST_UNSET_POST('ok'); }
 }
 

-if (IS_FORM_SENT()) {
+if (isFormSent()) {

        // Update stamps directly
        ADMIN_SAVE_SETTINGS_POST();
 } else {
        // Update stamps directly
        ADMIN_SAVE_SETTINGS_POST();
 } else {

diff --git a/inc/modules/admin/what-config_points.php b/inc/modules/admin/what-config_points.php
index 3b714a963fdda08295db709b1cb6f4898e057c3b..6cfa96aa661d939c3a5ec9652c770b982cab2986 100644 (file)
--- a/inc/modules/admin/what-config_points.php
+++ b/inc/modules/admin/what-config_points.php
@@ -72,7 +72,7 @@ if (REQUEST_ISSET_GET('sub')) {
        REQUEST_SET_GET('sub', "overview");
 }
 
        REQUEST_SET_GET('sub', "overview");
 }
 

-if (IS_FORM_SENT()) {
+if (isFormSent()) {

        INIT_SQLS();
        switch (REQUEST_GET('sub'))
        {
        INIT_SQLS();
        switch (REQUEST_GET('sub'))
        {

diff --git a/inc/modules/admin/what-config_primera.php b/inc/modules/admin/what-config_primera.php
index 1c02776ae8bd264af39898081070221357663e9d..d4af5be2dbb1ea782d49d41bf59e5c9d47afa686 100644 (file)
--- a/inc/modules/admin/what-config_primera.php
+++ b/inc/modules/admin/what-config_primera.php
@@ -45,7 +45,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 // Add description as navigation point
 ADD_DESCR('admin', __FILE__);
 
 // Add description as navigation point
 ADD_DESCR('admin', __FILE__);
 

-if (IS_FORM_SENT()) {
+if (isFormSent()) {

        // First merge temporarily the new API data into the current config
        mergeConfig(REQUEST_POST_ARRAY());
 
        // First merge temporarily the new API data into the current config
        mergeConfig(REQUEST_POST_ARRAY());
 

diff --git a/inc/modules/admin/what-config_proxy.php b/inc/modules/admin/what-config_proxy.php
index 3a690de5c9b9810f574a9f5f5a9770483ffcab10..369d543fae0daec46eae11e59bc43c43334bea8f 100644 (file)
--- a/inc/modules/admin/what-config_proxy.php
+++ b/inc/modules/admin/what-config_proxy.php
@@ -45,7 +45,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 // Add description as navigation point
 ADD_DESCR('admin', __FILE__);
 
 // Add description as navigation point
 ADD_DESCR('admin', __FILE__);
 

-if (IS_FORM_SENT()) {
+if (isFormSent()) {

        // Test proxy settings
        if (ADMIN_TEST_PROXY_SETTINGS(REQUEST_POST_ARRAY())) {
                // Save configuration
        // Test proxy settings
        if (ADMIN_TEST_PROXY_SETTINGS(REQUEST_POST_ARRAY())) {
                // Save configuration

diff --git a/inc/modules/admin/what-config_refback.php b/inc/modules/admin/what-config_refback.php
index 9432f694822acae488f360e0b45bdf507c4aaca6..7d568d1e5e31177e51557f1cd79a9907f63277ff 100644 (file)
--- a/inc/modules/admin/what-config_refback.php
+++ b/inc/modules/admin/what-config_refback.php
@@ -45,7 +45,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 // Add description as navigation point
 ADD_DESCR('admin', __FILE__);
 
 // Add description as navigation point
 ADD_DESCR('admin', __FILE__);
 

-if (IS_FORM_SENT()) {
+if (isFormSent()) {

        // Save configuration
        ADMIN_SAVE_SETTINGS_POST();
 } else {
        // Save configuration
        ADMIN_SAVE_SETTINGS_POST();
 } else {

diff --git a/inc/modules/admin/what-config_refid.php b/inc/modules/admin/what-config_refid.php
index cef646c3067cf9abaab739e3649505452f2d9935..e0c7373048f05064fc8180575ad3e9c199449532 100644 (file)
--- a/inc/modules/admin/what-config_refid.php
+++ b/inc/modules/admin/what-config_refid.php
@@ -45,7 +45,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 // Add description as navigation point
 ADD_DESCR('admin', __FILE__);
 
 // Add description as navigation point
 ADD_DESCR('admin', __FILE__);
 

-if (IS_FORM_SENT()) {
+if (isFormSent()) {

        // Save data
        ADMIN_SAVE_SETTINGS_POST();
 } else {
        // Save data
        ADMIN_SAVE_SETTINGS_POST();
 } else {

diff --git a/inc/modules/admin/what-config_register.php b/inc/modules/admin/what-config_register.php
index f1d578d871c54fae402b041a4afa3b64961a3f12..f7c4016c45b096b477abc9be445544308af324d7 100644 (file)
--- a/inc/modules/admin/what-config_register.php
+++ b/inc/modules/admin/what-config_register.php
@@ -46,7 +46,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 ADD_DESCR('admin', __FILE__);
 
 // Do we want to save changes?
 ADD_DESCR('admin', __FILE__);
 
 // Do we want to save changes?

-if (IS_FORM_SENT()) {
+if (isFormSent()) {

        foreach (REQUEST_POST('sel') as $id => $value) {
                SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_must_register` SET field_required='%s' WHERE `id`=%s AND field_required != '%s' LIMIT 1",
                array($value, bigintval($id), $value),__FILE__, __LINE__);
        foreach (REQUEST_POST('sel') as $id => $value) {
                SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_must_register` SET field_required='%s' WHERE `id`=%s AND field_required != '%s' LIMIT 1",
                array($value, bigintval($id), $value),__FILE__, __LINE__);

diff --git a/inc/modules/admin/what-config_register2.php b/inc/modules/admin/what-config_register2.php
index e5650dc474b3e6a61ff3571103fd7076045405c9..bf40ec0467114a385096f68b790230bbbf1f41f4 100644 (file)
--- a/inc/modules/admin/what-config_register2.php
+++ b/inc/modules/admin/what-config_register2.php
@@ -40,7 +40,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 // Add description as navigation point
 ADD_DESCR('admin', __FILE__);
 
 // Add description as navigation point
 ADD_DESCR('admin', __FILE__);
 

-if (IS_FORM_SENT()) {
+if (isFormSent()) {

        // Calculate timestamp from selections...
        REQUEST_SET_POST('ip_timeout', createTimestampFromSelections('ip_timeout', REQUEST_POST_ARRAY()));
        REQUEST_SET_POST('least_cats', round(REQUEST_POST('least_cats')));
        // Calculate timestamp from selections...
        REQUEST_SET_POST('ip_timeout', createTimestampFromSelections('ip_timeout', REQUEST_POST_ARRAY()));
        REQUEST_SET_POST('least_cats', round(REQUEST_POST('least_cats')));

diff --git a/inc/modules/admin/what-config_removeip.php b/inc/modules/admin/what-config_removeip.php
index 8967f1ef592ca5641f80f630e78d7c5915be632f..3ae85a89cd6598ecdf1cec24d610d519d918d976 100644 (file)
--- a/inc/modules/admin/what-config_removeip.php
+++ b/inc/modules/admin/what-config_removeip.php
@@ -45,7 +45,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 // Add description as navigation point
 ADD_DESCR('admin', __FILE__);
 
 // Add description as navigation point
 ADD_DESCR('admin', __FILE__);
 

-if (IS_FORM_SENT()) {
+if (isFormSent()) {

        // Save configuration
        ADMIN_SAVE_SETTINGS_POST();
 } else {
        // Save configuration
        ADMIN_SAVE_SETTINGS_POST();
 } else {

diff --git a/inc/modules/admin/what-config_rewrite.php b/inc/modules/admin/what-config_rewrite.php
index 8c36ce73ff5e4e9ceafc3467d368e8a76a6db792..4a744040817a62c91093cdae2f7227a6d9b13120 100644 (file)
--- a/inc/modules/admin/what-config_rewrite.php
+++ b/inc/modules/admin/what-config_rewrite.php
@@ -45,7 +45,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 // Add description as navigation point
 ADD_DESCR('admin', __FILE__);
 
 // Add description as navigation point
 ADD_DESCR('admin', __FILE__);
 

-if (IS_FORM_SENT()) {
+if (isFormSent()) {

        // Generate string
        $MODs = array();
        foreach (REQUEST_POST('mod') as $mod => $sel) {
        // Generate string
        $MODs = array();
        foreach (REQUEST_POST('mod') as $mod => $sel) {

diff --git a/inc/modules/admin/what-config_secure.php b/inc/modules/admin/what-config_secure.php
index b6d4f6425c44cefd102796d7cf5a99c938804064..ab2a1234e05ac697438a59cb17120b9c54ddb527 100644 (file)
--- a/inc/modules/admin/what-config_secure.php
+++ b/inc/modules/admin/what-config_secure.php
@@ -44,7 +44,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 // Add description as navigation point
 ADD_DESCR('admin', __FILE__);
 
 // Add description as navigation point
 ADD_DESCR('admin', __FILE__);
 

-if (IS_FORM_SENT()) {
+if (isFormSent()) {

        // If salt length is empty or null then we shall generate new passwords
        if (!REQUEST_ISSET_POST(('salt_length')) || (REQUEST_POST('salt_length') == '0')) {
                // Generate new passwords for all!
        // If salt length is empty or null then we shall generate new passwords
        if (!REQUEST_ISSET_POST(('salt_length')) || (REQUEST_POST('salt_length') == '0')) {
                // Generate new passwords for all!

diff --git a/inc/modules/admin/what-config_session.php b/inc/modules/admin/what-config_session.php
index 4ee5e525a64427887afba30d700120a0a17a8682..3d987ab922364f012d6c4fcad956cdd07330b854 100644 (file)
--- a/inc/modules/admin/what-config_session.php
+++ b/inc/modules/admin/what-config_session.php
@@ -45,7 +45,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 // Add description as navigation point
 ADD_DESCR('admin', __FILE__);
 
 // Add description as navigation point
 ADD_DESCR('admin', __FILE__);
 

-if (IS_FORM_SENT()) {
+if (isFormSent()) {

        // Test Path
        if ((!REQUEST_ISSET_POST(('session_save_path'))) || ((isDirectory(REQUEST_POST('session_save_path'))) && (is_writeable(REQUEST_POST('session_save_path'))))) {
                // Save configuration
        // Test Path
        if ((!REQUEST_ISSET_POST(('session_save_path'))) || ((isDirectory(REQUEST_POST('session_save_path'))) && (is_writeable(REQUEST_POST('session_save_path'))))) {
                // Save configuration

diff --git a/inc/modules/admin/what-config_sponsor.php b/inc/modules/admin/what-config_sponsor.php
index 656165484ec6e92acdd49837be968a42eb9e33e3..f834d2e8e9be5f9e47ef8f4becece628a1df0972 100644 (file)
--- a/inc/modules/admin/what-config_sponsor.php
+++ b/inc/modules/admin/what-config_sponsor.php
@@ -45,7 +45,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 // Add description as navigation point
 ADD_DESCR('admin', __FILE__);
 
 // Add description as navigation point
 ADD_DESCR('admin', __FILE__);
 

-if (IS_FORM_SENT()) {
+if (isFormSent()) {

        // Allow only direct points (non-floating)
        REQUEST_SET_POST('sponsor_min_points', bigintval(REQUEST_POST('sponsor_min_points')));
        REQUEST_SET_POST('sponsor_ref_points', bigintval(REQUEST_POST('sponsor_ref_points')));
        // Allow only direct points (non-floating)
        REQUEST_SET_POST('sponsor_min_points', bigintval(REQUEST_POST('sponsor_min_points')));
        REQUEST_SET_POST('sponsor_ref_points', bigintval(REQUEST_POST('sponsor_ref_points')));

diff --git a/inc/modules/admin/what-config_stats.php b/inc/modules/admin/what-config_stats.php
index 0118f7e7c2870d2bafc6e89ca33ca0134888b70c..8f2b6284e9670d226c2dc9caa8b479c7050a3a48 100644 (file)
--- a/inc/modules/admin/what-config_stats.php
+++ b/inc/modules/admin/what-config_stats.php
@@ -46,7 +46,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 ADD_DESCR('admin', __FILE__);
 
 // Was the form submitted?
 ADD_DESCR('admin', __FILE__);
 
 // Was the form submitted?

-if (IS_FORM_SENT()) {
+if (isFormSent()) {

        // Save settings
        ADMIN_SAVE_SETTINGS_POST();
 } else {
        // Save settings
        ADMIN_SAVE_SETTINGS_POST();
 } else {

diff --git a/inc/modules/admin/what-config_surfbar.php b/inc/modules/admin/what-config_surfbar.php
index f1b04536c285976eb279e1439ef43f8c09b44ad4..8d15d73c6d8f3972f8a405f7cb58ca55db1e8463 100644 (file)
--- a/inc/modules/admin/what-config_surfbar.php
+++ b/inc/modules/admin/what-config_surfbar.php
@@ -46,7 +46,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 ADD_DESCR('admin', __FILE__);
 
 // Was the form submitted?
 ADD_DESCR('admin', __FILE__);
 
 // Was the form submitted?

-if (IS_FORM_SENT()) {
+if (isFormSent()) {

        // Replace german decimal comma with computer decimal dot
        if (REQUEST_ISSET_POST(('surfbar_static_reward')))   REQUEST_SET_POST('surfbar_static_reward'  , convertCommaToDot(REQUEST_POST('surfbar_static_reward')));
        if (REQUEST_ISSET_POST(('surfbar_static_costs')))    REQUEST_SET_POST('surfbar_static_costs'   , convertCommaToDot(REQUEST_POST('surfbar_static_costs')));
        // Replace german decimal comma with computer decimal dot
        if (REQUEST_ISSET_POST(('surfbar_static_reward')))   REQUEST_SET_POST('surfbar_static_reward'  , convertCommaToDot(REQUEST_POST('surfbar_static_reward')));
        if (REQUEST_ISSET_POST(('surfbar_static_costs')))    REQUEST_SET_POST('surfbar_static_costs'   , convertCommaToDot(REQUEST_POST('surfbar_static_costs')));

diff --git a/inc/modules/admin/what-config_title.php b/inc/modules/admin/what-config_title.php
index f1da62aea665cfeb487fecc736f0beca67eeb323..b490c12b3426886e575d0acb95bd29f119c91419 100644 (file)
--- a/inc/modules/admin/what-config_title.php
+++ b/inc/modules/admin/what-config_title.php
@@ -45,13 +45,10 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 // Add description as navigation point
 ADD_DESCR('admin', __FILE__);
 
 // Add description as navigation point
 ADD_DESCR('admin', __FILE__);
 

-if (IS_FORM_SENT())
-{
+if (isFormSent()) {

        // Save settings
        ADMIN_SAVE_SETTINGS_POST();
        // Save settings
        ADMIN_SAVE_SETTINGS_POST();

-}
-else
-{
+} else {

        // Remember config data in constants for the template
        define('__CFG_TITLE_LEFT'     , getConfig('title_left'));
        define('__CFG_TITLE_MIDDLE'   , getConfig('title_middle'));
        // Remember config data in constants for the template
        define('__CFG_TITLE_LEFT'     , getConfig('title_left'));
        define('__CFG_TITLE_MIDDLE'   , getConfig('title_middle'));


@@ -63,5 +60,6 @@ else
        // Load template
        LOAD_TEMPLATE("admin_config_title");
 }
        // Load template
        LOAD_TEMPLATE("admin_config_title");
 }

+

 //
 ?>
 //
 ?>

diff --git a/inc/modules/admin/what-config_top10.php b/inc/modules/admin/what-config_top10.php
index 25ddd963a38ffbb3bca0ac52e4ee3b91ee52a043..b6876e55250f1d1a81406e41f56383e210add6d4 100644 (file)
--- a/inc/modules/admin/what-config_top10.php
+++ b/inc/modules/admin/what-config_top10.php
@@ -45,18 +45,16 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 // Add description as navigation point
 ADD_DESCR('admin', __FILE__);
 
 // Add description as navigation point
 ADD_DESCR('admin', __FILE__);
 

-if (IS_FORM_SENT())
-{
+if (isFormSent()) {

        // Save settings
        ADMIN_SAVE_SETTINGS_POST();
        // Save settings
        ADMIN_SAVE_SETTINGS_POST();

-}
-else
-{
+} else {

        // Prepare constants for the template
        define('__MAX_VALUE', getConfig('top10_max'));
 
        // Load form template
        LOAD_TEMPLATE("admin_config_top10");
 }
        // Prepare constants for the template
        define('__MAX_VALUE', getConfig('top10_max'));
 
        // Load form template
        LOAD_TEMPLATE("admin_config_top10");
 }

+

 //
 ?>
 //
 ?>

diff --git a/inc/modules/admin/what-config_transfer.php b/inc/modules/admin/what-config_transfer.php
index 08969d6d12f2bc4056d17e23c35eff6a6a1776c4..7557e6b45a03b123942ddac783519a16a32fd207 100644 (file)
--- a/inc/modules/admin/what-config_transfer.php
+++ b/inc/modules/admin/what-config_transfer.php
@@ -45,7 +45,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 // Add description as navigation point
 ADD_DESCR('admin', __FILE__);
 
 // Add description as navigation point
 ADD_DESCR('admin', __FILE__);
 

-if (IS_FORM_SENT()) {
+if (isFormSent()) {

        // Save settings...
        ADMIN_SAVE_SETTINGS_POST();
 }
        // Save settings...
        ADMIN_SAVE_SETTINGS_POST();
 }

diff --git a/inc/modules/admin/what-config_user.php b/inc/modules/admin/what-config_user.php
index 6abf5b6c766e16486d61450acef00622644ff647..8b5a2e7f93f7051f21c56b4f74e4532af4fe99bd 100644 (file)
--- a/inc/modules/admin/what-config_user.php
+++ b/inc/modules/admin/what-config_user.php
@@ -44,7 +44,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 // Add description as navigation point
 ADD_DESCR('admin', __FILE__);
 
 // Add description as navigation point
 ADD_DESCR('admin', __FILE__);
 

-if (IS_FORM_SENT()) {
+if (isFormSent()) {

        // Save settings
        ADMIN_SAVE_SETTINGS_POST();
 } else {
        // Save settings
        ADMIN_SAVE_SETTINGS_POST();
 } else {

diff --git a/inc/modules/admin/what-config_wernis.php b/inc/modules/admin/what-config_wernis.php
index 51016bf8172451f938000fd243beb8d4be59f9a1..d112c9565b1a31c6fca263fd2327cd119e92d1ca 100644 (file)
--- a/inc/modules/admin/what-config_wernis.php
+++ b/inc/modules/admin/what-config_wernis.php
@@ -45,7 +45,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 // Add description as navigation point
 ADD_DESCR('admin', __FILE__);
 
 // Add description as navigation point
 ADD_DESCR('admin', __FILE__);
 

-if (IS_FORM_SENT()) {
+if (isFormSent()) {

        // First merge temporarily the new API data into the current config
        mergeConfig(REQUEST_POST_ARRAY());
 
        // First merge temporarily the new API data into the current config
        mergeConfig(REQUEST_POST_ARRAY());
 

diff --git a/inc/modules/admin/what-config_yoomedia.php b/inc/modules/admin/what-config_yoomedia.php
index 506ff3b30830a15a71eb0d8693d5d72e82bdcaed..80cf4ba27fc5a75464baf9eee25d72efd2a0eeec 100644 (file)
--- a/inc/modules/admin/what-config_yoomedia.php
+++ b/inc/modules/admin/what-config_yoomedia.php
@@ -49,7 +49,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 ADD_DESCR('admin', __FILE__);
 
 // Was the form submitted?
 ADD_DESCR('admin', __FILE__);
 
 // Was the form submitted?

-if (IS_FORM_SENT()) {
+if (isFormSent()) {

        // Test Yoo!Media config
        if (YOOMEDIA_TEST_CONFIG(REQUEST_POST_ARRAY())) {
                // Save settings
        // Test Yoo!Media config
        if (YOOMEDIA_TEST_CONFIG(REQUEST_POST_ARRAY())) {
                // Save settings

diff --git a/inc/modules/admin/what-del_sponsor.php b/inc/modules/admin/what-del_sponsor.php
index 9291a2a39fed2939c4c16eba1a68548a760f1afb..bacc1857af8c8ab43718e3505cd9d842980681af 100644 (file)
--- a/inc/modules/admin/what-del_sponsor.php
+++ b/inc/modules/admin/what-del_sponsor.php
@@ -51,7 +51,7 @@ if (REQUEST_ISSET_GET('id')) {
        array(bigintval(REQUEST_GET('id'))), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 1) {
                // Remove sponsor
        array(bigintval(REQUEST_GET('id'))), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 1) {
                // Remove sponsor

-               if (IS_FORM_SENT()) {
+               if (isFormSent()) {

                        // Load data and remember it in constants
                        list($email, $gender, $surname, $family) = SQL_FETCHROW($result);
 
                        // Load data and remember it in constants
                        list($email, $gender, $surname, $family) = SQL_FETCHROW($result);
 

diff --git a/inc/modules/admin/what-del_user.php b/inc/modules/admin/what-del_user.php
index 400a7292b3b4758c8d403d0af54ddeb384c93f4d..9c18169179aac2eeb39ce3fdd30a1038aa6a37e1 100644 (file)
--- a/inc/modules/admin/what-del_user.php
+++ b/inc/modules/admin/what-del_user.php
@@ -46,7 +46,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 ADD_DESCR('admin', __FILE__);
 
 // User exists..
 ADD_DESCR('admin', __FILE__);
 
 // User exists..

-if ((IS_FORM_SENT()) || ((REQUEST_ISSET_POST('del')) && (REQUEST_ISSET_POST(('reason'))))) {
+if ((isFormSent()) || ((REQUEST_ISSET_POST('del')) && (REQUEST_ISSET_POST(('reason'))))) {

        // Delete users account
        $result_user = SQL_QUERY_ESC("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
        array(bigintval(REQUEST_GET('uid'))), __FILE__, __LINE__);
        // Delete users account
        $result_user = SQL_QUERY_ESC("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
        array(bigintval(REQUEST_GET('uid'))), __FILE__, __LINE__);

diff --git a/inc/modules/admin/what-edit_emails.php b/inc/modules/admin/what-edit_emails.php
index 72308c7e01e2df31d9f61d48a60ff5b1199e98c0..c36da875352539a30b4bf41537f42e0cad4adeae 100644 (file)
--- a/inc/modules/admin/what-edit_emails.php
+++ b/inc/modules/admin/what-edit_emails.php
@@ -45,13 +45,13 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 // Add description as navigation point
 ADD_DESCR('admin', __FILE__);
 
 // Add description as navigation point
 ADD_DESCR('admin', __FILE__);
 

-if ((IS_FORM_SENT()) && (!REQUEST_ISSET_POST('id'))) {
+if ((isFormSent()) && (!REQUEST_ISSET_POST('id'))) {

        REQUEST_UNSET_POST('ok');
 }
 
 $result = SQL_QUERY("SELECT id, sender, subject, payment_id, cat_id FROM `{!_MYSQL_PREFIX!}_pool` ORDER BY timestamp", __FILE__, __LINE__);
 if (SQL_NUMROWS($result) > 0) {
        REQUEST_UNSET_POST('ok');
 }
 
 $result = SQL_QUERY("SELECT id, sender, subject, payment_id, cat_id FROM `{!_MYSQL_PREFIX!}_pool` ORDER BY timestamp", __FILE__, __LINE__);
 if (SQL_NUMROWS($result) > 0) {

-       if (IS_FORM_SENT()) {
+       if (isFormSent()) {

                // Make mail editable...
                $result = SQL_QUERY_ESC("SELECT subject, text, url FROM `{!_MYSQL_PREFIX!}_pool` WHERE `id`=%s LIMIT 1",
                array(bigintval(REQUEST_POST('id'))), __FILE__, __LINE__);
                // Make mail editable...
                $result = SQL_QUERY_ESC("SELECT subject, text, url FROM `{!_MYSQL_PREFIX!}_pool` WHERE `id`=%s LIMIT 1",
                array(bigintval(REQUEST_POST('id'))), __FILE__, __LINE__);

diff --git a/inc/modules/admin/what-edit_sponsor.php b/inc/modules/admin/what-edit_sponsor.php
index 64b052ff662f09f0f9c184c3c3c5cf8da517f7e7..cc1f7295d9a81e90de0d45afcc64223e9028d50a 100644 (file)
--- a/inc/modules/admin/what-edit_sponsor.php
+++ b/inc/modules/admin/what-edit_sponsor.php
@@ -104,7 +104,7 @@ if ((REQUEST_ISSET_GET('id')) && (REQUEST_ISSET_GET(('mode')))) {
                INIT_SQLS();
 
                // Sponsor was found
                INIT_SQLS();
 
                // Sponsor was found

-               if ((IS_FORM_SENT()) || (REQUEST_ISSET_POST('edit'))) {
+               if ((isFormSent()) || (REQUEST_ISSET_POST('edit'))) {

                        // Perform action on mode
                        switch (REQUEST_GET('mode'))
                        {
                        // Perform action on mode
                        switch (REQUEST_GET('mode'))
                        {

diff --git a/inc/modules/admin/what-guest_add.php b/inc/modules/admin/what-guest_add.php
index fbee30723a5f56792486df2ed194c56b58b5e824..650e4ed6677ec9916dc60a1276d8df187d864f9b 100644 (file)
--- a/inc/modules/admin/what-guest_add.php
+++ b/inc/modules/admin/what-guest_add.php
@@ -46,12 +46,12 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 ADD_DESCR('admin', __FILE__);
 
 // Check if the admin has entered title and what-php file name...
 ADD_DESCR('admin', __FILE__);
 
 // Check if the admin has entered title and what-php file name...

-if (((!REQUEST_ISSET_POST(('title'))) || (!REQUEST_ISSET_POST(('menu')))) && (IS_FORM_SENT())) {
+if (((!REQUEST_ISSET_POST(('title'))) || (!REQUEST_ISSET_POST(('menu')))) && (isFormSent())) {

        // Abort adding the menu entry
        REQUEST_UNSET_POST('ok');
 }
 
        // Abort adding the menu entry
        REQUEST_UNSET_POST('ok');
 }
 

-if (!IS_FORM_SENT()) {
+if (!isFormSent()) {

        // Create arrays
        $menus = array(); $titles = array(); $below = array();
 
        // Create arrays
        $menus = array(); $titles = array(); $below = array();
 

diff --git a/inc/modules/admin/what-guestedit.php b/inc/modules/admin/what-guestedit.php
index fdab16c8b601170e6be1a3bb8c6131e095fa5cdf..f36e508510c936d84cd318db4211ccd95181a7ab 100644 (file)
--- a/inc/modules/admin/what-guestedit.php
+++ b/inc/modules/admin/what-guestedit.php
@@ -142,7 +142,7 @@ if ((REQUEST_ISSET_POST('edit')) && ($chk > 0) && (!IS_DEMO()))
 
        // Load template
        LOAD_TEMPLATE("admin_gmenu_delete");
 
        // Load template
        LOAD_TEMPLATE("admin_gmenu_delete");

-} elseif ((IS_FORM_SENT()) && (!IS_DEMO())) {
+} elseif ((isFormSent()) && (!IS_DEMO())) {

        // An action is done...
        switch (REQUEST_POST('ok'))
        {
        // An action is done...
        switch (REQUEST_POST('ok'))
        {

diff --git a/inc/modules/admin/what-list_payouts.php b/inc/modules/admin/what-list_payouts.php
index 921c40e79502d5a310c328ec418107c7b3898389..13e6812f989083aba043c7284f462bb7bc7c59cc 100644 (file)
--- a/inc/modules/admin/what-list_payouts.php
+++ b/inc/modules/admin/what-list_payouts.php
@@ -80,7 +80,7 @@ if (REQUEST_ISSET_GET(('pid'))) {
 
                if ((REQUEST_GET('do') == "accept") && (!empty($email))) {
                        // Ok, now we can output the form or execute accepting
 
                if ((REQUEST_GET('do') == "accept") && (!empty($email))) {
                        // Ok, now we can output the form or execute accepting

-                       if (IS_FORM_SENT()) {
+                       if (isFormSent()) {

                                // Obtain payout type and other data
                                $result = SQL_QUERY_ESC("SELECT payout_id FROM `{!_MYSQL_PREFIX!}_user_payouts` WHERE `id`=%s LIMIT 1",
                                array(bigintval(REQUEST_GET('pid'))), __FILE__, __LINE__);
                                // Obtain payout type and other data
                                $result = SQL_QUERY_ESC("SELECT payout_id FROM `{!_MYSQL_PREFIX!}_user_payouts` WHERE `id`=%s LIMIT 1",
                                array(bigintval(REQUEST_GET('pid'))), __FILE__, __LINE__);


@@ -169,7 +169,7 @@ if (REQUEST_ISSET_GET(('pid'))) {
                        }
                } elseif ((REQUEST_GET('do') == "reject") && (!empty($email))) {
                        // Ok, now we can output the form or execute rejecting
                        }
                } elseif ((REQUEST_GET('do') == "reject") && (!empty($email))) {
                        // Ok, now we can output the form or execute rejecting

-                       if (IS_FORM_SENT()) {
+                       if (isFormSent()) {

                                if ($task > 0) {
                                        // Clear task
                                        runFilterChain('solve_task', $task);
                                if ($task > 0) {
                                        // Clear task
                                        runFilterChain('solve_task', $task);

diff --git a/inc/modules/admin/what-list_yoomedia_tm.php b/inc/modules/admin/what-list_yoomedia_tm.php
index 4ff7c5ac7994f9307fb6d9299e0d9ad23784655c..b8fcf915a440e7ddffff457a742a059f9f6b924c 100644 (file)
--- a/inc/modules/admin/what-list_yoomedia_tm.php
+++ b/inc/modules/admin/what-list_yoomedia_tm.php
@@ -51,7 +51,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 ADD_DESCR('admin', __FILE__);
 
 // Do actions here
 ADD_DESCR('admin', __FILE__);
 
 // Do actions here

-if (IS_FORM_SENT()) {
+if (isFormSent()) {

        // Prepare mail for delivery
        YOOMEDIA_PREPARE_MAIL_DELIVERY(REQUEST_POST_ARRAY());
        return;
        // Prepare mail for delivery
        YOOMEDIA_PREPARE_MAIL_DELIVERY(REQUEST_POST_ARRAY());
        return;

diff --git a/inc/modules/admin/what-lock_sponsor.php b/inc/modules/admin/what-lock_sponsor.php
index 7acd09d1c2291e667dac7d066c621a777bb04da9..54973551c54359e4766a07c506747a33dfdbe00c 100644 (file)
--- a/inc/modules/admin/what-lock_sponsor.php
+++ b/inc/modules/admin/what-lock_sponsor.php
@@ -62,7 +62,7 @@ if (REQUEST_ISSET_GET('id')) {
                        define('__FAMILY' , $fname);
                        define('__ID'     , bigintval(REQUEST_GET('id')));
 
                        define('__FAMILY' , $fname);
                        define('__ID'     , bigintval(REQUEST_GET('id')));
 

-                       if (IS_FORM_SENT()) {
+                       if (isFormSent()) {

                                // Create messages
                                if ($status == 'CONFIRMED') {
                                        // Message when sponsor's account got lock
                                // Create messages
                                if ($status == 'CONFIRMED') {
                                        // Message when sponsor's account got lock

diff --git a/inc/modules/admin/what-maintenance.php b/inc/modules/admin/what-maintenance.php
index 100c998567fc83d109461512bc5eb7bc8fc663ac..56794823c5d1de8841263afc4fcab65e8e7b800c 100644 (file)
--- a/inc/modules/admin/what-maintenance.php
+++ b/inc/modules/admin/what-maintenance.php
@@ -45,7 +45,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 // Add description as navigation point
 ADD_DESCR('admin', __FILE__);
 
 // Add description as navigation point
 ADD_DESCR('admin', __FILE__);
 

-if (IS_FORM_SENT()) {
+if (isFormSent()) {

        // De- or activate maintenance mode
        switch (getConfig('maintenance'))
        {
        // De- or activate maintenance mode
        switch (getConfig('maintenance'))
        {

diff --git a/inc/modules/admin/what-mem_add.php b/inc/modules/admin/what-mem_add.php
index 8a445316b128c52c5b597cb11708795dc2f90da9..3269df0ff71dc331767fb95db3b0937ad3bb9e69 100644 (file)
--- a/inc/modules/admin/what-mem_add.php
+++ b/inc/modules/admin/what-mem_add.php
@@ -47,11 +47,11 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 ADD_DESCR('admin', __FILE__);
 
 // Check if the admin has entered title and what-php file name...
 ADD_DESCR('admin', __FILE__);
 
 // Check if the admin has entered title and what-php file name...

-if ((!REQUEST_ISSET_POST(('title'))) && (IS_FORM_SENT())) {
+if ((!REQUEST_ISSET_POST(('title'))) && (isFormSent())) {

        REQUEST_UNSET_POST('ok');
 } // END - if
 
        REQUEST_UNSET_POST('ok');
 } // END - if
 

-if (!IS_FORM_SENT()) {
+if (!isFormSent()) {

        // Create arrays
        $menus = array(); $titles = array(); $below = array();
 
        // Create arrays
        $menus = array(); $titles = array(); $below = array();
 

diff --git a/inc/modules/admin/what-memedit.php b/inc/modules/admin/what-memedit.php
index bcb3844f31e484afb601b55e06e0691a77581fda..a9d1e0dae4c5b09ca223145a7d92dbdaeed1938a 100644 (file)
--- a/inc/modules/admin/what-memedit.php
+++ b/inc/modules/admin/what-memedit.php
@@ -175,7 +175,7 @@ if ((REQUEST_ISSET_POST('edit')) && ($chk > 0) && (!IS_DEMO())) {
        define('__CNT_VALUE', $cnt);
        //
        LOAD_TEMPLATE("admin_mmenu_status");
        define('__CNT_VALUE', $cnt);
        //
        LOAD_TEMPLATE("admin_mmenu_status");

-} elseif ((IS_FORM_SENT()) && (!IS_DEMO())) {
+} elseif ((isFormSent()) && (!IS_DEMO())) {

        // An act is done...
        foreach (REQUEST_POST('sel') as $sel => $menu) {
                $AND = "(`what` = '' OR `what` IS NULL)";
        // An act is done...
        foreach (REQUEST_POST('sel') as $sel => $menu) {
                $AND = "(`what` = '' OR `what` IS NULL)";

diff --git a/inc/modules/admin/what-payments.php b/inc/modules/admin/what-payments.php
index a296935eab04a067f7f5d0dd5b3101ba69704fbf..a0422882c2457b2001c0194e414dfb916ceef22b 100644 (file)
--- a/inc/modules/admin/what-payments.php
+++ b/inc/modules/admin/what-payments.php
@@ -49,7 +49,7 @@ if (((!REQUEST_ISSET_POST(('t_wait'))) || (!REQUEST_ISSET_POST(('payment')))) &&
        REQUEST_UNSET_POST('ok');
 }
 
        REQUEST_UNSET_POST('ok');
 }
 

-if (IS_FORM_SENT()) {
+if (isFormSent()) {

        switch (REQUEST_GET('do')) {
                case 'add':
                        ADD_SQL("INSERT INTO `{!_MYSQL_PREFIX!}_payments` (time, payment, mail_title, price) VALUES ('".REQUEST_POST('t_wait')."','".REQUEST_POST('payment')."','".REQUEST_POST('title')."','".REQUEST_POST('price')."')");
        switch (REQUEST_GET('do')) {
                case 'add':
                        ADD_SQL("INSERT INTO `{!_MYSQL_PREFIX!}_payments` (time, payment, mail_title, price) VALUES ('".REQUEST_POST('t_wait')."','".REQUEST_POST('payment')."','".REQUEST_POST('title')."','".REQUEST_POST('price')."')");

diff --git a/inc/modules/admin/what-refbanner.php b/inc/modules/admin/what-refbanner.php
index 8be4f99466c24678cd55411f19d323f0fb09a760..21b8a84e9c6f8ec494b3d78494156783cd662ff5 100644 (file)
--- a/inc/modules/admin/what-refbanner.php
+++ b/inc/modules/admin/what-refbanner.php
@@ -56,7 +56,7 @@ if ((!REQUEST_ISSET_POST('url')) || (!REQUEST_ISSET_POST(('alternate')))) {
 // Check selection count
 if (REQUEST_ISSET_POST('sel')) $SEL = countPostSelection();
 
 // Check selection count
 if (REQUEST_ISSET_POST('sel')) $SEL = countPostSelection();
 

-if (IS_FORM_SENT()) {
+if (isFormSent()) {

        // Fix older calls from add-new-banner-form
        if (!REQUEST_ISSET_GET(('mode'))) REQUEST_SET_GET('mode', 'add');
        $sql = '';
        // Fix older calls from add-new-banner-form
        if (!REQUEST_ISSET_GET(('mode'))) REQUEST_SET_GET('mode', 'add');
        $sql = '';

diff --git a/inc/modules/admin/what-send_bonus.php b/inc/modules/admin/what-send_bonus.php
index ed6591d16c9fc5d6b12f55500c2cb2942739085f..0e5d9f95f36ccb6021b8f09a9d41a37bc6ca57f0 100644 (file)
--- a/inc/modules/admin/what-send_bonus.php
+++ b/inc/modules/admin/what-send_bonus.php
@@ -51,7 +51,7 @@ ADD_DESCR('admin', __FILE__);
 // Set empty mode to "select"
 if (!REQUEST_ISSET_GET('mode')) REQUEST_SET_GET('mode', "select");
 
 // Set empty mode to "select"
 if (!REQUEST_ISSET_GET('mode')) REQUEST_SET_GET('mode', "select");
 

-if (IS_FORM_SENT()) {
+if (isFormSent()) {

        // Deliver bonus mail
        addNewBonusMail(REQUEST_POST_ARRAY(), REQUEST_GET('mode'));
 } else {
        // Deliver bonus mail
        addNewBonusMail(REQUEST_POST_ARRAY(), REQUEST_GET('mode'));
 } else {

diff --git a/inc/modules/admin/what-send_newsletter.php b/inc/modules/admin/what-send_newsletter.php
index c96e883df0019b3d1babb21912953c00d23951c1..9cdac1d2a6aa64e1e4a722dff3662ba7e47bee51 100644 (file)
--- a/inc/modules/admin/what-send_newsletter.php
+++ b/inc/modules/admin/what-send_newsletter.php
@@ -45,7 +45,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 // Add description as navigation point
 ADD_DESCR('admin', __FILE__);
 
 // Add description as navigation point
 ADD_DESCR('admin', __FILE__);
 

-if (IS_FORM_SENT()) {
+if (isFormSent()) {

        $result = SQL_QUERY("SELECT userid, email
 FROM `{!_MYSQL_PREFIX!}_user_data`
 WHERE `status`='CONFIRMED' AND nl_receive='Y'
        $result = SQL_QUERY("SELECT userid, email
 FROM `{!_MYSQL_PREFIX!}_user_data`
 WHERE `status`='CONFIRMED' AND nl_receive='Y'

diff --git a/inc/modules/admin/what-sub_points.php b/inc/modules/admin/what-sub_points.php
index 804e29413fef74ece1565f4e33fa47970c5eafa5..94f4f9ded805bb57164edfe8f720aa0cb8ef9fd5 100644 (file)
--- a/inc/modules/admin/what-sub_points.php
+++ b/inc/modules/admin/what-sub_points.php
@@ -54,7 +54,7 @@ if (REQUEST_GET('uid') == "all") {
        define('__POINTS_VALUE', REQUEST_POST('points'));
 
        // Is the form sent?
        define('__POINTS_VALUE', REQUEST_POST('points'));
 
        // Is the form sent?

-       if ((IS_FORM_SENT()) && (REQUEST_POST('points') > 0)) {
+       if ((isFormSent()) && (REQUEST_POST('points') > 0)) {

                $result_main = SQL_QUERY("SELECT userid, email FROM `{!_MYSQL_PREFIX!}_user_data` WHERE `status`='CONFIRMED' ORDER BY `userid` ASC",
                __FILE__, __LINE__);
                while ($content = SQL_FETCHARRAY($result_main)) {
                $result_main = SQL_QUERY("SELECT userid, email FROM `{!_MYSQL_PREFIX!}_user_data` WHERE `status`='CONFIRMED' ORDER BY `userid` ASC",
                __FILE__, __LINE__);
                while ($content = SQL_FETCHARRAY($result_main)) {


@@ -87,7 +87,7 @@ if (REQUEST_GET('uid') == "all") {
                // Selected user does exist
                $content = SQL_FETCHARRAY($result);
 
                // Selected user does exist
                $content = SQL_FETCHARRAY($result);
 

-               if ((IS_FORM_SENT()) && (REQUEST_ISSET_POST(('points')))) {
+               if ((isFormSent()) && (REQUEST_ISSET_POST(('points')))) {

                        // Ok, add to used points and send an email to him...
                        SUB_POINTS("admin_single", bigintval(REQUEST_GET('uid')), REQUEST_POST('points'));
 
                        // Ok, add to used points and send an email to him...
                        SUB_POINTS("admin_single", bigintval(REQUEST_GET('uid')), REQUEST_POST('points'));
 

diff --git a/inc/modules/admin/what-unlock_emails.php b/inc/modules/admin/what-unlock_emails.php
index 36a3e66ed4e5d3bb593ba196dd0a0d4d2456d746..09af56904d4d48b99c3be3651817e7f9ff11a837 100644 (file)
--- a/inc/modules/admin/what-unlock_emails.php
+++ b/inc/modules/admin/what-unlock_emails.php
@@ -149,7 +149,7 @@ LIMIT 1",
                                sendEmail($DATA['sender'], getMessage('MEMBER_ORDER_REJECTED'), $msg_user);
 
                                // If you do not enter an URL to redirect to, your URL will be set!
                                sendEmail($DATA['sender'], getMessage('MEMBER_ORDER_REJECTED'), $msg_user);
 
                                // If you do not enter an URL to redirect to, your URL will be set!

-                               if ((!REQUEST_ISSET_POST(('redirect'))) || (REQUEST_POST('redirect') == "http://")) REQUEST_SET_POST('redirect', constant('URL'));
+                               if ((!REQUEST_ISSET_POST(('redirect'))) || (REQUEST_POST('redirect') == 'http://')) REQUEST_SET_POST('redirect', constant('URL'));

 
                                // Redirect URL
                                SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_pool` SET url='%s', data_type='NEW' WHERE `id`=%s LIMIT 1",
 
                                // Redirect URL
                                SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_pool` SET url='%s', data_type='NEW' WHERE `id`=%s LIMIT 1",


@@ -226,7 +226,7 @@ LIMIT 1",
                define('__UNLOCK_ROWS', $OUT);
 
                // Prepare rejection URL
                define('__UNLOCK_ROWS', $OUT);
 
                // Prepare rejection URL

-               $REJECT = "http://";
+               $REJECT = 'http://';

                if (GET_EXT_VERSION('other') >= '0.1.6') $REJECT = getConfig('reject_url');
                define('__REJECT_URL', $REJECT);
 
                if (GET_EXT_VERSION('other') >= '0.1.6') $REJECT = getConfig('reject_url');
                define('__REJECT_URL', $REJECT);
 

diff --git a/inc/modules/admin/what-unlock_sponsor.php b/inc/modules/admin/what-unlock_sponsor.php
index 58a59baed3cde224f701dc268f23cbd8592afcd4..4571d749fd1a026754808bd44310a98badc2db42 100644 (file)
--- a/inc/modules/admin/what-unlock_sponsor.php
+++ b/inc/modules/admin/what-unlock_sponsor.php
@@ -46,7 +46,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 ADD_DESCR('admin', __FILE__);
 
 // Check if admin has submitted form
 ADD_DESCR('admin', __FILE__);
 
 // Check if admin has submitted form

-if (IS_FORM_SENT()) {
+if (isFormSent()) {

        // Does he have selected at least one sponsor?
        if (countSelection(REQUEST_POST('id')) > 0) {
                // At least one entry selected
        // Does he have selected at least one sponsor?
        if (countSelection(REQUEST_POST('id')) > 0) {
                // At least one entry selected

diff --git a/inc/modules/admin/what-usage.php b/inc/modules/admin/what-usage.php
index 0f77c2730caa11d760d009ed4137b582a30540f8..c776c2c24874fe49420e02f18176d65213900b06 100644 (file)
--- a/inc/modules/admin/what-usage.php
+++ b/inc/modules/admin/what-usage.php
@@ -100,7 +100,7 @@ if ((!empty($FQFN)) && (isFileReadable($FQFN))) {
        $content = str_replace("usage_", "{!URL!}/modules.php?module=admin&what=".$GLOBALS['what']."&usage=", str_replace(".html", '', $content));
 
        // Disabled due to too much trouble
        $content = str_replace("usage_", "{!URL!}/modules.php?module=admin&what=".$GLOBALS['what']."&usage=", str_replace(".html", '', $content));
 
        // Disabled due to too much trouble

-       //$content = str_replace("HREF=\"http://", "href=\"{!URL!}/modules.php?module=loader&url=http://", $content);
+       //$content = str_replace("HREF=\'http://', "href=\"{!URL!}/modules.php?module=loader&url=http://", $content);

        $test = strtolower($content);
 
        // Do we need to strip out above and including <body> plus trailing </html> tag?
        $test = strtolower($content);
 
        // Do we need to strip out above and including <body> plus trailing </html> tag?

diff --git a/inc/modules/admin/what-user_contct.php b/inc/modules/admin/what-user_contct.php
index 002bccaa9f88a9310f545207fe384a91bc8ecb64..7e8a56f70d0dde64014f9cbde2d1d62c20404342 100644 (file)
--- a/inc/modules/admin/what-user_contct.php
+++ b/inc/modules/admin/what-user_contct.php
@@ -49,7 +49,7 @@ ADD_DESCR('admin', __FILE__);
 if ((REQUEST_ISSET_GET('uid')) && (bigintval(REQUEST_GET('uid')) > 0)) {
        // Load user data and display it
        $result = SQL_QUERY_ESC("SELECT surname, family, email FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
 if ((REQUEST_ISSET_GET('uid')) && (bigintval(REQUEST_GET('uid')) > 0)) {
        // Load user data and display it
        $result = SQL_QUERY_ESC("SELECT surname, family, email FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",

-       array(bigintval(REQUEST_GET('uid'))), __FILE__, __LINE__);
+               array(bigintval(REQUEST_GET('uid'))), __FILE__, __LINE__);

 
        // Is a user account found?
        if (SQL_NUMROWS($result) == 1) {
 
        // Is a user account found?
        if (SQL_NUMROWS($result) == 1) {


@@ -60,7 +60,7 @@ if ((REQUEST_ISSET_GET('uid')) && (bigintval(REQUEST_GET('uid')) > 0)) {
                $content['uid'] = bigintval(REQUEST_GET('uid'));
 
                // Shall we send the email?
                $content['uid'] = bigintval(REQUEST_GET('uid'));
 
                // Shall we send the email?

-               if (IS_FORM_SENT()) {
+               if (isFormSent()) {

                        // Insert text
                        $content['text'] = trim(strip_tags(REQUEST_POST('text')));
 
                        // Insert text
                        $content['text'] = trim(strip_tags(REQUEST_POST('text')));
 

diff --git a/inc/modules/guest/what-confirm.php b/inc/modules/guest/what-confirm.php
index 31a55f147f4dd6b5278b53494045d3b4591f1e7e..71ac9cca914a7810f7ffd5bcc28c457a463c78a8 100644 (file)
--- a/inc/modules/guest/what-confirm.php
+++ b/inc/modules/guest/what-confirm.php
@@ -137,7 +137,7 @@ if (REQUEST_ISSET_GET(('hash'))) {
                define('__UID', '0');
                LOAD_TEMPLATE('guest_confirm_table');
        }
                define('__UID', '0');
                LOAD_TEMPLATE('guest_confirm_table');
        }

-} elseif ((IS_FORM_SENT()) && (REQUEST_ISSET_POST('email'))) {
+} elseif ((isFormSent()) && (REQUEST_ISSET_POST('email'))) {

        // Confirmation link requested      0     1         2
        $result = SQL_QUERY_ESC("SELECT userid, status, user_hash FROM `{!_MYSQL_PREFIX!}_user_data` WHERE email='%s' LIMIT 1",
                array(REQUEST_POST('email')), __FILE__, __LINE__);
        // Confirmation link requested      0     1         2
        $result = SQL_QUERY_ESC("SELECT userid, status, user_hash FROM `{!_MYSQL_PREFIX!}_user_data` WHERE email='%s' LIMIT 1",
                array(REQUEST_POST('email')), __FILE__, __LINE__);

diff --git a/inc/modules/guest/what-login.php b/inc/modules/guest/what-login.php
index 36a113f829322b85ef62333747c6f47c146d1a7b..654c29f3cddbb583c37acd94503c220fed50ad15 100644 (file)
--- a/inc/modules/guest/what-login.php
+++ b/inc/modules/guest/what-login.php
@@ -63,7 +63,7 @@ $add = '';
 if ((isUserIdSet()) && (isSessionVariableSet('u_hash'))) {
        // Maybe, then continue with it
        $uid = getUserId();
 if ((isUserIdSet()) && (isSessionVariableSet('u_hash'))) {
        // Maybe, then continue with it
        $uid = getUserId();

-} elseif ((REQUEST_ISSET_POST('id')) && (REQUEST_ISSET_POST(('password'))) && (IS_FORM_SENT())) {
+} elseif ((REQUEST_ISSET_POST('id')) && (REQUEST_ISSET_POST(('password'))) && (isFormSent())) {

        // Set userid and crypt password when login data was submitted
        if ((EXT_IS_ACTIVE('nickname')) && (NICKNAME_PROBE_ON_USERID(REQUEST_POST('id')))) {
                // Nickname entered
        // Set userid and crypt password when login data was submitted
        if ((EXT_IS_ACTIVE('nickname')) && (NICKNAME_PROBE_ON_USERID(REQUEST_POST('id')))) {
                // Nickname entered


@@ -88,10 +88,10 @@ if (!REQUEST_ISSET_GET(('login')))     REQUEST_SET_GET('login'    , '');
 if (IS_MEMBER()) {
        // Login immidiately...
        $URL = 'modules.php?module=login';
 if (IS_MEMBER()) {
        // Login immidiately...
        $URL = 'modules.php?module=login';

-} elseif ((IS_FORM_SENT()) && (''.$uid.'' != ''.REQUEST_POST('id') . '')) {
+} elseif ((isFormSent()) && (''.$uid.'' != ''.REQUEST_POST('id') . '')) {

        // Invalid input (no nickname extension installed but nickname entered)
        $errorCode = getCode('EXTENSION_PROBLEM');
        // Invalid input (no nickname extension installed but nickname entered)
        $errorCode = getCode('EXTENSION_PROBLEM');

-} elseif (IS_FORM_SENT()) {
+} elseif (isFormSent()) {

        // Try the login (see inc/libs/user_functions.php)
        $URL = USER_DO_LOGIN(REQUEST_POST('id'), REQUEST_POST('password'));
 } elseif ((REQUEST_ISSET_POST(('new_pass'))) && (isset($uid))) {
        // Try the login (see inc/libs/user_functions.php)
        $URL = USER_DO_LOGIN(REQUEST_POST('id'), REQUEST_POST('password'));
 } elseif ((REQUEST_ISSET_POST(('new_pass'))) && (isset($uid))) {

diff --git a/inc/modules/guest/what-register.php b/inc/modules/guest/what-register.php
index d1fcfb1cd2c8178c00e7afea645d8e9ee40b9365..34b985cf9955b2232ec93cc78ea75c94a3f36dec 100644 (file)
--- a/inc/modules/guest/what-register.php
+++ b/inc/modules/guest/what-register.php
@@ -53,7 +53,7 @@ global $DATA;
 // Initialize variables
 $isFailed = false; $SHORT_PASS = false; $cats = 0; $IP_TIMEOUT = false;
 
 // Initialize variables
 $isFailed = false; $SHORT_PASS = false; $cats = 0; $IP_TIMEOUT = false;
 

-if (!IS_FORM_SENT()) REQUEST_UNSET_POST('ok');
+if (!isFormSent()) REQUEST_UNSET_POST('ok');

 
 if (!REQUEST_ISSET_POST(('agree')))        REQUEST_SET_POST('agree'       , '');
 if (!REQUEST_ISSET_POST(('addy')))         REQUEST_SET_POST('addy'        , '');
 
 if (!REQUEST_ISSET_POST(('agree')))        REQUEST_SET_POST('agree'       , '');
 if (!REQUEST_ISSET_POST(('addy')))         REQUEST_SET_POST('addy'        , '');


@@ -90,7 +90,7 @@ if ($GLOBALS['refid'] > 0) {
        }
 } // END - if
 
        }
 } // END - if
 

-if (IS_FORM_SENT()) {
+if (isFormSent()) {

        // First we only check the submitted data then we continue... :)
        //
        // Did he agree to our Terms Of Usage?
        // First we only check the submitted data then we continue... :)
        //
        // Did he agree to our Terms Of Usage?


@@ -176,7 +176,7 @@ if (IS_FORM_SENT()) {
        SQL_FREERESULT($result);
 }
 
        SQL_FREERESULT($result);
 }
 

-if ((IS_FORM_SENT()) && (($isFailed === false) || (IS_ADMIN()))) {
+if ((isFormSent()) && (($isFailed === false) || (IS_ADMIN()))) {

        // Prepapre month and day of birth
        if (strlen(REQUEST_POST('day'))   == 1) REQUEST_SET_POST('day'  , '0'.REQUEST_POST('day'));
        if (strlen(REQUEST_POST('month')) == 1) REQUEST_SET_POST('month', '0'.REQUEST_POST('month'));
        // Prepapre month and day of birth
        if (strlen(REQUEST_POST('day'))   == 1) REQUEST_SET_POST('day'  , '0'.REQUEST_POST('day'));
        if (strlen(REQUEST_POST('month')) == 1) REQUEST_SET_POST('month', '0'.REQUEST_POST('month'));

diff --git a/inc/modules/guest/what-sponsor_login.php b/inc/modules/guest/what-sponsor_login.php
index 40ecd01c95b3347afbb118c90a7eb78c9d0c31c6..9f447ef678ce699c868a4d77b061291b6bf6f5ec 100644 (file)
--- a/inc/modules/guest/what-sponsor_login.php
+++ b/inc/modules/guest/what-sponsor_login.php
@@ -125,12 +125,12 @@ WHERE `id`='%s' AND hash='%s' AND `status`='EMAIL' LIMIT 1",
        SQL_FREERESULT($result);
 } elseif ($mode == 'activate') {
        // Send activation link again
        SQL_FREERESULT($result);
 } elseif ($mode == 'activate') {
        // Send activation link again

-       if (IS_FORM_SENT()) {
+       if (isFormSent()) {

                // Check submitted data
                if (!REQUEST_ISSET_POST('email')) REQUEST_UNSET_POST('ok');
        }
 
                // Check submitted data
                if (!REQUEST_ISSET_POST('email')) REQUEST_UNSET_POST('ok');
        }
 

-       if (IS_FORM_SENT()) {
+       if (isFormSent()) {

                // Check email
                $result = SQL_QUERY_ESC("SELECT id, hash, status, remote_addr, gender, surname, family, sponsor_created
 FROM `{!_MYSQL_PREFIX!}_sponsor_data`
                // Check email
                $result = SQL_QUERY_ESC("SELECT id, hash, status, remote_addr, gender, surname, family, sponsor_created
 FROM `{!_MYSQL_PREFIX!}_sponsor_data`


@@ -171,12 +171,12 @@ WHERE email='%s' AND (`status`='UNCONFIRMED' OR `status`='EMAIL') LIMIT 1",
        }
 } elseif ($mode == 'lost_pass') {
        // Send new password
        }
 } elseif ($mode == 'lost_pass') {
        // Send new password

-       if (IS_FORM_SENT()) {
+       if (isFormSent()) {

                // Check submitted data
                if (!REQUEST_ISSET_POST('email')) REQUEST_UNSET_POST('ok');
        } // END - if
 
                // Check submitted data
                if (!REQUEST_ISSET_POST('email')) REQUEST_UNSET_POST('ok');
        } // END - if
 

-       if (IS_FORM_SENT()) {
+       if (isFormSent()) {

                // Check email
                $result = SQL_QUERY_ESC("SELECT id, hash, remote_addr, gender, surname, family, sponsor_created
 FROM `{!_MYSQL_PREFIX!}_sponsor_data`
                // Check email
                $result = SQL_QUERY_ESC("SELECT id, hash, remote_addr, gender, surname, family, sponsor_created
 FROM `{!_MYSQL_PREFIX!}_sponsor_data`


@@ -217,7 +217,7 @@ WHERE `id`='%s' LIMIT 1",
                // Load form
                LOAD_TEMPLATE('guest_sponsor_lost');
        }
                // Load form
                LOAD_TEMPLATE('guest_sponsor_lost');
        }

-} elseif (IS_FORM_SENT()) {
+} elseif (isFormSent()) {

        // Check status and login data ...
        $result = SQL_QUERY_ESC("SELECT status FROM `{!_MYSQL_PREFIX!}_sponsor_data`
 WHERE `id`='%s' AND password='%s' LIMIT 1",
        // Check status and login data ...
        $result = SQL_QUERY_ESC("SELECT status FROM `{!_MYSQL_PREFIX!}_sponsor_data`
 WHERE `id`='%s' AND password='%s' LIMIT 1",

diff --git a/inc/modules/guest/what-sponsor_reg.php b/inc/modules/guest/what-sponsor_reg.php
index d44d67cfd708fa97e8c7373c961c0acdc2381b70..5284c5b1c4f3da672640522e618efd9ab91b7c27 100644 (file)
--- a/inc/modules/guest/what-sponsor_reg.php
+++ b/inc/modules/guest/what-sponsor_reg.php
@@ -50,7 +50,7 @@ ADD_DESCR('guest', __FILE__);
 // Create array for form errors (= missing data)
 $FORM_ERRORS = array();
 
 // Create array for form errors (= missing data)
 $FORM_ERRORS = array();
 

-if (IS_FORM_SENT()) {
+if (isFormSent()) {

        //
        // Check submitted form data
        //
        //
        // Check submitted form data
        //


@@ -196,7 +196,7 @@ if (IS_FORM_SENT()) {
        if (count($FORM_ERRORS) > 0) REQUEST_UNSET_POST('ok');
 }
 
        if (count($FORM_ERRORS) > 0) REQUEST_UNSET_POST('ok');
 }
 

-if ((IS_FORM_SENT()) && (count($FORM_ERRORS) == 0)) {
+if ((isFormSent()) && (count($FORM_ERRORS) == 0)) {

        // Generate message array
        $messageArray = array(
                'failed' => getMessage('SPONSOR_REGISTRATION_FAILED'),
        // Generate message array
        $messageArray = array(
                'failed' => getMessage('SPONSOR_REGISTRATION_FAILED'),

diff --git a/inc/modules/member/what-categories.php b/inc/modules/member/what-categories.php
index 20b9853d6deb9515a59e5886f2ff364b1e2c6581..c74bf25aa40a1c2044bec35b0733a6dee19cd252 100644 (file)
--- a/inc/modules/member/what-categories.php
+++ b/inc/modules/member/what-categories.php
@@ -56,7 +56,7 @@ $cats = SQL_NUMROWS($result);
 
 if ($cats > 0) {
        $LEAST = false;
 
 if ($cats > 0) {
        $LEAST = false;

-       if (IS_FORM_SENT()) {
+       if (isFormSent()) {

                $cnt = 0;
                foreach (REQUEST_POST('cat') as $cat => $joined) {
                        if ($joined == 'N') $cnt++;
                $cnt = 0;
                foreach (REQUEST_POST('cat') as $cat => $joined) {
                        if ($joined == 'N') $cnt++;


@@ -68,7 +68,7 @@ if ($cats > 0) {
                }
        }
 
                }
        }
 

-       if (IS_FORM_SENT()) {
+       if (isFormSent()) {

                foreach (REQUEST_POST('cat') as $cat => $joined) {
                        switch ($joined) {
                                case 'Y':
                foreach (REQUEST_POST('cat') as $cat => $joined) {
                        switch ($joined) {
                                case 'Y':

diff --git a/inc/modules/member/what-holiday.php b/inc/modules/member/what-holiday.php
index ec15bd331b3dd4dfcb51f5751b660ed174674fe3..f4d4dcca5fda7b7944161c93e004d6bb00bdb2bb 100644 (file)
--- a/inc/modules/member/what-holiday.php
+++ b/inc/modules/member/what-holiday.php
@@ -88,7 +88,7 @@ if ((SQL_NUMROWS($result1) == 1) || (SQL_NUMROWS($result2) == 1)) {
 SQL_FREERESULT($result1);
 SQL_FREERESULT($result2);
 
 SQL_FREERESULT($result1);
 SQL_FREERESULT($result2);
 

-if (IS_FORM_SENT()) {
+if (isFormSent()) {

        // Check holiday request...
        $START = mktime(0, 0, 0, REQUEST_POST('start_month'), REQUEST_POST('start_day'), REQUEST_POST('start_year'));
        $END   = mktime(0, 0, 0, REQUEST_POST('end_month')  , REQUEST_POST('end_day')  , REQUEST_POST('end_year')  );
        // Check holiday request...
        $START = mktime(0, 0, 0, REQUEST_POST('start_month'), REQUEST_POST('start_day'), REQUEST_POST('start_year'));
        $END   = mktime(0, 0, 0, REQUEST_POST('end_month')  , REQUEST_POST('end_day')  , REQUEST_POST('end_year')  );


@@ -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 something is wrong or link in menu is just clicked display form

-if ((!IS_FORM_SENT()) && (!REQUEST_ISSET_POST('stop'))) {
+if ((!isFormSent()) && (!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__);
        // 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__);

diff --git a/inc/modules/member/what-html_mail.php b/inc/modules/member/what-html_mail.php
index 0695f2a3b7ff239921643d6fc5c45e5fbca8bc7e..0e19e054a65b8fbda7d1381a52cad448a13970e6 100644 (file)
--- a/inc/modules/member/what-html_mail.php
+++ b/inc/modules/member/what-html_mail.php
@@ -51,7 +51,7 @@ if (!defined('__SECURITY')) {
 ADD_DESCR('member', __FILE__);
 
 // Class was found and loaded
 ADD_DESCR('member', __FILE__);
 
 // Class was found and loaded

-if (IS_FORM_SENT()) {
+if (isFormSent()) {

        // Save settings
        SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET `html`='%s' WHERE userid=%s LIMIT 1",
        array(REQUEST_POST('html'), getUserId()), __FILE__, __LINE__);
        // Save settings
        SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET `html`='%s' WHERE userid=%s LIMIT 1",
        array(REQUEST_POST('html'), getUserId()), __FILE__, __LINE__);

diff --git a/inc/modules/member/what-newsletter.php b/inc/modules/member/what-newsletter.php
index cc14a7c17792275c0f8895e2b47a1d5ac744f978..eb7ef02f8cd8e4769ce40c5959283c734b8653e0 100644 (file)
--- a/inc/modules/member/what-newsletter.php
+++ b/inc/modules/member/what-newsletter.php
@@ -59,7 +59,7 @@ SQL_FREERESULT($result);
 // Remember charge value
 define('__CHARGE_VALUE', translateComma(getConfig('nl_charge')));
 
 // Remember charge value
 define('__CHARGE_VALUE', translateComma(getConfig('nl_charge')));
 

-if ((IS_FORM_SENT()) && ($status == 'Y') && ($span == '0')) {
+if ((isFormSent()) && ($status == 'Y') && ($span == '0')) {

        // Save request
        SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET nl_timespan='".(getConfig('one_day') * 30)."' WHERE userid=%s LIMIT 1",
        array(getUserId()), __FILE__, __LINE__);
        // Save request
        SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET nl_timespan='".(getConfig('one_day') * 30)."' WHERE userid=%s LIMIT 1",
        array(getUserId()), __FILE__, __LINE__);

diff --git a/inc/modules/member/what-nickname.php b/inc/modules/member/what-nickname.php
index d8b505d5354ee06b93ea8201deee8f084f82a518..b0ed554e8bb88360513ab05a310dfaa3807a38a6 100644 (file)
--- a/inc/modules/member/what-nickname.php
+++ b/inc/modules/member/what-nickname.php
@@ -51,7 +51,7 @@ if (!defined('__SECURITY')) {
 ADD_DESCR('member', __FILE__);
 $isValid = false;
 
 ADD_DESCR('member', __FILE__);
 $isValid = false;
 

-if (IS_FORM_SENT()) {
+if (isFormSent()) {

        // Nickname was submitted so let's check if it is not already in use
        if (REQUEST_ISSET_POST(('nickname'))) {
                // Check if nickname is valid
        // Nickname was submitted so let's check if it is not already in use
        if (REQUEST_ISSET_POST(('nickname'))) {
                // Check if nickname is valid

diff --git a/inc/modules/member/what-order.php b/inc/modules/member/what-order.php
index 84aee47079a27202a12fe6409970a2e356af0dfb..f0dc82a36132359b1b430b72551417d6877d5beb 100644 (file)
--- a/inc/modules/member/what-order.php
+++ b/inc/modules/member/what-order.php
@@ -116,7 +116,7 @@ WHERE sender=%s AND url='%s' AND timestamp > (UNIX_TIMESTAMP() - %s) LIMIT 1",
                $URL = '';
                if (getConfig('test_text') == 'Y') {
                        // Test submitted text against some filters (length, URLs in text etc.)
                $URL = '';
                if (getConfig('test_text') == 'Y') {
                        // Test submitted text against some filters (length, URLs in text etc.)

-                       if ((strpos(strtolower(REQUEST_POST('text')), "https://") > -1) || (strpos(strtolower(REQUEST_POST('text')), "http://") > -1) || (strpos(strtolower(REQUEST_POST('text')), "www") > -1)) {
+                       if ((strpos(strtolower(REQUEST_POST('text')), "https://") > -1) || (strpos(strtolower(REQUEST_POST('text')), 'http://') > -1) || (strpos(strtolower(REQUEST_POST('text')), "www") > -1)) {

                                // URL found!
                                $URL = 'modules.php?module=login&what=order&msg=' . getCode('URL_FOUND');
                        } // END - if
                                // URL found!
                                $URL = 'modules.php?module=login&what=order&msg=' . getCode('URL_FOUND');
                        } // END - if


@@ -135,7 +135,7 @@ WHERE sender=%s AND url='%s' AND timestamp > (UNIX_TIMESTAMP() - %s) LIMIT 1",
                if (getConfig('test_subj') == 'Y') {
                        // Check the subject line for issues
                        REQUEST_SET_POST('subject', str_replace("\\", "[nl]", substr(REQUEST_POST('subject'), 0, 200)));
                if (getConfig('test_subj') == 'Y') {
                        // Check the subject line for issues
                        REQUEST_SET_POST('subject', str_replace("\\", "[nl]", substr(REQUEST_POST('subject'), 0, 200)));

-                       if ((strpos(strtolower(REQUEST_POST('subject')), "http://") > -1) || (strpos(strtolower(REQUEST_POST('subject')), "www") > -1)) {
+                       if ((strpos(strtolower(REQUEST_POST('subject')), 'http://') > -1) || (strpos(strtolower(REQUEST_POST('subject')), "www") > -1)) {

                                // URL in subject found
                                $URL = 'modules.php?module=login&what=order&msg=' . getCode('SUBJ_URL');
                        } // END - if
                                // URL in subject found
                                $URL = 'modules.php?module=login&what=order&msg=' . getCode('SUBJ_URL');
                        } // END - if


@@ -616,7 +616,7 @@ LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__);
                                        $OLD_ORDER = true;
                                } else {
                                        // Default output for that your members don't forget it...
                                        $OLD_ORDER = true;
                                } else {
                                        // Default output for that your members don't forget it...

-                                       $url = "http://";
+                                       $url = 'http://';

                                }
 
                                // Free result
                                }
 
                                // Free result

diff --git a/inc/modules/member/what-payout.php b/inc/modules/member/what-payout.php
index 5c6e5e2c9ec04fa73a8f350ea070b36f6ba03ca6..81a601c79d3268f3cffdccfb56d86528c9977bed 100644 (file)
--- a/inc/modules/member/what-payout.php
+++ b/inc/modules/member/what-payout.php
@@ -185,7 +185,7 @@ ORDER BY p.payout_timestamp DESC",
 
                if (convertCommaToDot($TPTS) >= $content['min_points']) {
                        // Ok, he can get be paid
 
                if (convertCommaToDot($TPTS) >= $content['min_points']) {
                        // Ok, he can get be paid

-                       if ((IS_FORM_SENT()) && ($PAYOUT <= $PAY_MAX) && ($PAYOUT >= $content['min_points'])) {
+                       if ((isFormSent()) && ($PAYOUT <= $PAY_MAX) && ($PAYOUT >= $content['min_points'])) {

                                // Calculate exact value
                                // @TODO Rewrite this constant
                                define('PAYOUT_POINTS_VALUE', $PAYOUT);
                                // Calculate exact value
                                // @TODO Rewrite this constant
                                define('PAYOUT_POINTS_VALUE', $PAYOUT);

diff --git a/inc/modules/member/what-primera.php b/inc/modules/member/what-primera.php
index 9642d44c6e00c5bdfd949fabbb890c0f0cddda26..d66b0fca25e5196512102b922f2ff0652d74449f 100644 (file)
--- a/inc/modules/member/what-primera.php
+++ b/inc/modules/member/what-primera.php
@@ -156,7 +156,7 @@ if (REQUEST_GET('mode') == "pay") {
 }
 
 // Is the formular sent?
 }
 
 // Is the formular sent?

-if ((IS_FORM_SENT()) && (REQUEST_ISSET_GET(('mode')))) {
+if ((isFormSent()) && (REQUEST_ISSET_GET(('mode')))) {

        // Check input data depending on the mode and execute the requested mode
        switch (REQUEST_GET('mode')) {
                case "pay": // Payout this exchange -> Primus
        // Check input data depending on the mode and execute the requested mode
        switch (REQUEST_GET('mode')) {
                case "pay": // Payout this exchange -> Primus

diff --git a/inc/modules/member/what-support.php b/inc/modules/member/what-support.php
index b16ca6ba8a19bbf79242a615b828cfe4f1d7d25e..2bbdfbc2db63e7df639f655fb23267269c59111a 100644 (file)
--- a/inc/modules/member/what-support.php
+++ b/inc/modules/member/what-support.php
@@ -50,7 +50,7 @@ if (!defined('__SECURITY')) {
 // Add description as navigation point
 ADD_DESCR('member', __FILE__);
 
 // Add description as navigation point
 ADD_DESCR('member', __FILE__);
 

-if ((!IS_FORM_SENT()) || (!REQUEST_ISSET_POST(('qsummary')))) {
+if ((!isFormSent()) || (!REQUEST_ISSET_POST(('qsummary')))) {

        // Output form
        LOAD_TEMPLATE("member_support_form");
 } else {
        // Output form
        LOAD_TEMPLATE("member_support_form");
 } else {

diff --git a/inc/modules/member/what-surfbar_book.php b/inc/modules/member/what-surfbar_book.php
index 5b2515bf2ac16ad626db14a24a42830f32a31c60..794e1d6b255d5d28edc0192681901224a25c373b 100644 (file)
--- a/inc/modules/member/what-surfbar_book.php
+++ b/inc/modules/member/what-surfbar_book.php
@@ -55,7 +55,7 @@ ADD_DESCR('member', __FILE__);
 if (!SURFBAR_IF_USER_BOOK_MORE_URLS()) {
        // No more URLs allowed to book!
        LOAD_TEMPLATE('admin_settings_saved', false, getMessage('MEMBER_SURFBAR_NO_MORE_ALLOWED'));
 if (!SURFBAR_IF_USER_BOOK_MORE_URLS()) {
        // No more URLs allowed to book!
        LOAD_TEMPLATE('admin_settings_saved', false, getMessage('MEMBER_SURFBAR_NO_MORE_ALLOWED'));

-} elseif ((IS_FORM_SENT()) && (REQUEST_ISSET_POST(('limited')))) {
+} elseif ((isFormSent()) && (REQUEST_ISSET_POST(('limited')))) {

        // Is limitation "no" and "limit" is > 0?
        if ((REQUEST_POST('limited') == 'N') && ((REQUEST_ISSET_POST(('limit'))) && (REQUEST_POST('limit') > 0)) || (!REQUEST_ISSET_POST(('limit')))) {
                // Set it to unlimited
        // Is limitation "no" and "limit" is > 0?
        if ((REQUEST_POST('limited') == 'N') && ((REQUEST_ISSET_POST(('limit'))) && (REQUEST_POST('limit') > 0)) || (!REQUEST_ISSET_POST(('limit')))) {
                // Set it to unlimited

diff --git a/inc/modules/member/what-surfbar_list.php b/inc/modules/member/what-surfbar_list.php
index 6de11b2e39d54688783594e98259ae075dfbe8e7..7ad3917915406552802989f4244aeb3aee4ce040 100644 (file)
--- a/inc/modules/member/what-surfbar_list.php
+++ b/inc/modules/member/what-surfbar_list.php
@@ -54,7 +54,7 @@ ADD_DESCR('member', __FILE__);
 $URLs = SURFBAR_GET_USER_URLS();
 
 // Are there entries or form is submitted?
 $URLs = SURFBAR_GET_USER_URLS();
 
 // Are there entries or form is submitted?

-if ((IS_FORM_SENT()) && (REQUEST_ISSET_POST(('action'))) && (REQUEST_ISSET_POST('id'))) {
+if ((isFormSent()) && (REQUEST_ISSET_POST(('action'))) && (REQUEST_ISSET_POST('id'))) {

        // Process the form
        if (SURFBAR_MEMBER_DO_FORM(REQUEST_POST_ARRAY(), $URLs)) {
                // Action performed but shall we display it?
        // Process the form
        if (SURFBAR_MEMBER_DO_FORM(REQUEST_POST_ARRAY(), $URLs)) {
                // Action performed but shall we display it?

diff --git a/inc/modules/member/what-transfer.php b/inc/modules/member/what-transfer.php
index 86a69e9b076b7e4acdc57a75405b6622748e8f72..5ce05ad5678e9bee4f0543009ebe8ab877196c0b 100644 (file)
--- a/inc/modules/member/what-transfer.php
+++ b/inc/modules/member/what-transfer.php
@@ -73,7 +73,7 @@ switch ($mode)
                // Remember maximum value for template
                define('__TRANSFER_MAX_VALUE', round($total - getConfig('transfer_balance') - 0.5));
 
                // Remember maximum value for template
                define('__TRANSFER_MAX_VALUE', round($total - getConfig('transfer_balance') - 0.5));
 

-               if (IS_FORM_SENT()) {
+               if (isFormSent()) {

                        // Add new transfer
                        if (getConfig('transfer_code') > 0) {
                                // Check for code
                        // Add new transfer
                        if (getConfig('transfer_code') > 0) {
                                // Check for code


@@ -228,7 +228,7 @@ switch ($mode)
                        }
                }
 
                        }
                }
 

-               if (!IS_FORM_SENT()) {
+               if (!isFormSent()) {

                        // Load member list
                        if (EXT_IS_ACTIVE('nickname')) {
                                // Load userid and nickname
                        // Load member list
                        if (EXT_IS_ACTIVE('nickname')) {
                                // Load userid and nickname


@@ -502,7 +502,7 @@ KEY(party_uid)
                                        define('__TRANSFER_ALL_LINK', $total);
                                }
 
                                        define('__TRANSFER_ALL_LINK', $total);
                                }
 

-                               if (IS_FORM_SENT()) {
+                               if (isFormSent()) {

                                        // Save settings
                                        SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET opt_in='%s' WHERE userid=%s LIMIT 1",
                                        array(REQUEST_POST('opt_in'), getUserId()), __FILE__, __LINE__);
                                        // Save settings
                                        SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET opt_in='%s' WHERE userid=%s LIMIT 1",
                                        array(REQUEST_POST('opt_in'), getUserId()), __FILE__, __LINE__);

diff --git a/inc/modules/member/what-wernis.php b/inc/modules/member/what-wernis.php
index b704421a6a91e1f8494a1a9b9355f16b95510f31..c74520066af2aa0633cd464e4c312cc4a58e25aa 100644 (file)
--- a/inc/modules/member/what-wernis.php
+++ b/inc/modules/member/what-wernis.php
@@ -201,7 +201,7 @@ if ((!REQUEST_ISSET_GET(('mode'))) || (REQUEST_GET('mode') == "choose")) {
 }
 
 // Is the formular sent?
 }
 
 // Is the formular sent?

-if ((IS_FORM_SENT()) && (REQUEST_ISSET_GET(('mode')))) {
+if ((isFormSent()) && (REQUEST_ISSET_GET(('mode')))) {

        // Is the user ID and password set?
        if (!REQUEST_ISSET_POST(('wds66_id'))) {
                // Nothing entered in WDS66 user ID
        // Is the user ID and password set?
        if (!REQUEST_ISSET_POST(('wds66_id'))) {
                // Nothing entered in WDS66 user ID

diff --git a/inc/modules/sponsor/account.php b/inc/modules/sponsor/account.php
index 52db53f8fe49b50028aac6fbd9a85ef7c39573ff..4c01863351d1b290fd9613c2ca9de5489f0490e7 100644 (file)
--- a/inc/modules/sponsor/account.php
+++ b/inc/modules/sponsor/account.php
@@ -63,7 +63,7 @@ if (SQL_NUMROWS($result) == 1) {
        $content = SQL_FETCHARRAY($result);
        if ($content['status'] == 'CONFIRMED') {
                // Check if form was submitted or not
        $content = SQL_FETCHARRAY($result);
        if ($content['status'] == 'CONFIRMED') {
                // Check if form was submitted or not

-               if (IS_FORM_SENT()) {
+               if (isFormSent()) {

                        // Check passwords
                        if (!REQUEST_ISSET_POST(('pass_old'))) {
                                // No current password entered
                        // Check passwords
                        if (!REQUEST_ISSET_POST(('pass_old'))) {
                                // No current password entered

diff --git a/inc/modules/sponsor/settings.php b/inc/modules/sponsor/settings.php
index 2aa04e5342e590bc0f6e8c3c6d0f6bc005ef0b58..495128ee8dfc7a9c7a3907b56dd6224e4c2be88d 100644 (file)
--- a/inc/modules/sponsor/settings.php
+++ b/inc/modules/sponsor/settings.php
@@ -58,7 +58,7 @@ if (SQL_NUMROWS($result) == 1) {
        $content = SQL_FETCHARRAY($result);
        if ($content['status'] == 'CONFIRMED') {
                // Check if form was submitted or not
        $content = SQL_FETCHARRAY($result);
        if ($content['status'] == 'CONFIRMED') {
                // Check if form was submitted or not

-               if (IS_FORM_SENT()) {
+               if (isFormSent()) {

                        // Check passwords
                        if (!REQUEST_ISSET_POST(('password'))) {
                                // No current password entered
                        // Check passwords
                        if (!REQUEST_ISSET_POST(('password'))) {
                                // No current password entered

diff --git a/inc/request-functions.php b/inc/request-functions.php
index e88d7c9860c2bc02096c11de1e67c167078be79b..b720ffc2d37589018fe592ee9eece8671f555f10 100644 (file)
--- a/inc/request-functions.php
+++ b/inc/request-functions.php
@@ -185,7 +185,7 @@ function REQUEST_SET_POST ($element, $value) {
 }
 
 // Checks wether a form was sent. If so, the $_POST['ok'] element must be set
 }
 
 // Checks wether a form was sent. If so, the $_POST['ok'] element must be set

-function IS_FORM_SENT () {
+function isFormSent () {

        // Simply wrap it!
        return REQUEST_ISSET_POST('ok');
 }
        // Simply wrap it!
        return REQUEST_ISSET_POST('ok');
 }