Encapsulation and fixes:

[mailer.git] / inc / libs / network_functions.php

diff --git a/inc/libs/network_functions.php b/inc/libs/network_functions.php
index 2dbcda200fdfbefa79d3cd5e9e60b6708e0416de..8220abf5c184426331081c1781955d64759300db 100644 (file)
--- a/inc/libs/network_functions.php
+++ b/inc/libs/network_functions.php
@@ -45,7 +45,7 @@ if (!defined('__SECURITY')) {
 // Handle a (maybe) sent form here
 function doNetworkHandleForm () {
        // Was the form sent?
-       if ((isFormSent()) || (isPostRequestParameterSet('edit')) || (isPostRequestParameterSet('del')) || (isPostRequestParameterSet('change')) || (isPostRequestParameterSet('remove'))) {
+       if ((isFormSent()) || (isFormSent('edit')) || (isFormSent('del')) || (isFormSent('change')) || (isFormSent('remove'))) {
                // Do we have a 'do'?
                if (isGetRequestParameterSet('do')) {
                        // Process the request
@@ -60,7 +60,7 @@ function doNetworkHandleForm () {
 // Processes an admin form
 function doAdminNetworkProcessForm () {
        // Form really sent?
-       if ((!isFormSent()) && (!isPostRequestParameterSet('edit')) && (!isPostRequestParameterSet('del')) && (!isPostRequestParameterSet('change')) && (!isPostRequestParameterSet('remove'))) {
+       if ((!isFormSent()) && (!isFormSent('edit')) && (!isFormSent('del')) && (!isFormSent('change')) && (!isFormSent('remove'))) {
                // Abort here
                loadTemplate('admin_settings_unsaved', false, getMessage('ADMIN_NETWORK_FORM_NOT_SENT'));
                return;
@@ -443,7 +443,7 @@ function doAdminNetworkProcessHandlenetworkForm () {
                                        // Add color
                                        $networkData['sw'] = $SW;
 
-                                       if (isPostRequestParameterSet('edit')) {
+                                       if (isFormSent('edit')) {
                                                // Make selection box for network_request_type
                                                $networkData['network_request_type'] = generateOptionList(
                                                        '/ARRAY/',
@@ -457,7 +457,7 @@ function doAdminNetworkProcessHandlenetworkForm () {
 
                                                // Add row template for editing
                                                $OUT .= loadTemplate('admin_edit_networks_row', true, $networkData);
-                                       } elseif (isPostRequestParameterSet('del')) {
+                                       } elseif (isFormSent('del')) {
                                                // Translate the request type
                                                $networkData['network_request_type'] = getMessage('ADMIN_NETWORK_REQUEST_TYPE_' . $networkData['network_request_type']);
 
@@ -477,9 +477,9 @@ function doAdminNetworkProcessHandlenetworkForm () {
                // If we have no rows, we don't need to display the edit form
                if (!empty($OUT)) {
                        // Output main template
-                       if (isPostRequestParameterSet('edit')) {
+                       if (isFormSent('edit')) {
                                loadTemplate('admin_edit_networks', false, $OUT);
-                       } elseif (isPostRequestParameterSet('del')) {
+                       } elseif (isFormSent('del')) {
                                loadTemplate('admin_del_networks', false, $OUT);
                        } else {
                                // Problem!
@@ -515,10 +515,10 @@ function doAdminNetworkProcessHandlenetworktypeForm () {
                                        // Add color
                                        $networkTypeData['sw'] = $SW;
 
-                                       if (isPostRequestParameterSet('edit')) {
+                                       if (isFormSent('edit')) {
                                                // Add row template for deleting
                                                $OUT .= loadTemplate('admin_edit_network_types_row', true, $networkTypeData);
-                                       } elseif (isPostRequestParameterSet('del')) {
+                                       } elseif (isFormSent('del')) {
                                                // Fix empty banner URL
                                                if (trim($networkTypeData['network_type_banner_url']) == '') $networkTypeData['network_type_banner_url'] = '---';
 
@@ -544,9 +544,9 @@ function doAdminNetworkProcessHandlenetworktypeForm () {
                        );
 
                        // Output main template
-                       if (isPostRequestParameterSet('edit')) {
+                       if (isFormSent('edit')) {
                                loadTemplate('admin_edit_network_types', false, $content);
-                       } elseif (isPostRequestParameterSet('del')) {
+                       } elseif (isFormSent('del')) {
                                loadTemplate('admin_del_network_types', false, $content);
                        } else {
                                // Problem!
@@ -585,7 +585,7 @@ function doAdminNetworkProcessHandlerequestparamsForm () {
                                        // Add color
                                        $networkRequestData['sw'] = $SW;
 
-                                       if (isPostRequestParameterSet('edit')) {
+                                       if (isFormSent('edit')) {
                                                // Add options list for network type
                                                $networkRequestData['type_options'] = generateNetworkTypeOptions($networkRequestData['network_type_id']);
 
@@ -594,7 +594,7 @@ function doAdminNetworkProcessHandlerequestparamsForm () {
 
                                                // Add row template for deleting
                                                $OUT .= loadTemplate('admin_edit_network_params_row', true, $networkRequestData);
-                                       } elseif (isPostRequestParameterSet('del')) {
+                                       } elseif (isFormSent('del')) {
                                                // Fix empty banner URL
                                                if (trim($networkRequestData['request_param_default']) == '') $networkRequestData['request_param_default'] = '---';
 
@@ -623,9 +623,9 @@ function doAdminNetworkProcessHandlerequestparamsForm () {
                        );
 
                        // Output main template
-                       if (isPostRequestParameterSet('edit')) {
+                       if (isFormSent('edit')) {
                                loadTemplate('admin_edit_network_params', false, $content);
-                       } elseif (isPostRequestParameterSet('del')) {
+                       } elseif (isFormSent('del')) {
                                loadTemplate('admin_del_network_params', false, $content);
                        } else {
                                // Problem!