Introduced new function capitalizeUnderscoreString(), rewritten 'do' parameter:

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

diff --git a/inc/libs/network_functions.php b/inc/libs/network_functions.php
index 7289d551c5af87ab07d0dfd3cdcd9cfee1d093ac..d8fbacec8ce99412d202b9083ce45e655847bd12 100644 (file)
--- a/inc/libs/network_functions.php
+++ b/inc/libs/network_functions.php
@@ -81,7 +81,7 @@ function doAdminNetworkProcessForm () {
        }
 
        // Create function name
-       $functionName = sprintf("doAdminNetworkProcess%sForm", ucfirst(strtolower(getRequestParameter('do'))));
+       $functionName = sprintf("doAdminNetworkProcess%sForm", capitalizeUnderscoreString(getRequestParameter('do')));
 
        // Is the function valid?
        if (!function_exists($functionName)) {
@@ -577,6 +577,29 @@ function generateNetworkTranslationOptions ($default = '') {
        return $GLOBALS['network_translation'][$default];
 }
 
+// Generates an option list of request types
+function generateNetworkRequestTypeOptions ($default = '') {
+       // Do we have cache?
+       if (!isset($GLOBALS['network_request_type'][$default])) {
+               // Generate the list
+               $GLOBALS['network_request_type'][$default] = generateOptionList(
+                       '/ARRAY/',
+                       array(
+                               'GET',
+                               'POST'
+                       ),
+                       array(
+                               '{--ADMIN_NETWORK_REQUEST_TYPE_GET--}',
+                               '{--ADMIN_NETWORK_REQUEST_TYPE_POST--}'
+                       ),
+                       $default
+               );
+       } // END - if
+
+       // Return cache
+       return $GLOBALS['network_request_type'][$default];
+}
+
 // Translates 'translate_name' for e.g. templates
 function translateNetworkTranslationName ($name) {
        // Get the message id
@@ -589,12 +612,18 @@ function translateNetworkTypeHandler ($type) {
        return getMessage('ADMIN_NETWORK_TYPES_' . strtoupper($type) . '');
 }
 
+// Translates request type
+function translateNetworkRequestType ($name) {
+       // Get the message id
+       return getMessage('ADMIN_NETWORK_REQUEST_TYPE_' . strtoupper($name) . '');
+}
+
 //------------------------------------------------------------------------------
 //                             Call-back functions
 //------------------------------------------------------------------------------
 
 // Callback function to add new network
-function doAdminNetworkProcessAddnetworkForm () {
+function doAdminNetworkProcessAddNetworkForm () {
        // We can say here, the form is sent, so check if the network is already added
        if (isNetworkNameValid(postRequestParameter('network_short_name'))) {
                // Already there
@@ -628,7 +657,7 @@ function doAdminNetworkProcessAddnetworkForm () {
 }
 
 // Displays selected networks for editing
-function doAdminNetworkProcessHandlenetworkForm () {
+function doAdminNetworkProcessHandleNetworkForm () {
        // Do we have selections?
        if (ifPostContainsSelections()) {
                // Something has been selected, so start displaying one by one
@@ -642,26 +671,9 @@ function doAdminNetworkProcessHandlenetworkForm () {
                                // Do we have found the network?
                                if (count($networkData) > 0) {
                                        if (isFormSent('edit')) {
-                                               // Make selection box for network_request_type
-                                               $networkData['network_request_type'] = generateOptionList(
-                                                       '/ARRAY/',
-                                                       array(
-                                                               'GET',
-                                                               'POST'
-                                                       ),
-                                                       array(
-                                                               '{--ADMIN_NETWORK_REQUEST_TYPE_GET--}',
-                                                               '{--ADMIN_NETWORK_REQUEST_TYPE_POST--}'
-                                                       ),
-                                                       $networkData['network_request_type']
-                                               );
-
                                                // Add row template for editing
                                                $OUT .= loadTemplate('admin_edit_networks_row', true, $networkData);
                                        } elseif (isFormSent('del')) {
-                                               // Translate the request type
-                                               $networkData['network_request_type'] = '{--ADMIN_NETWORK_REQUEST_TYPE_' . $networkData['network_request_type'] . '--}';
-
                                                // Add row template for deleting
                                                $OUT .= loadTemplate('admin_del_networks_row', true, $networkData);
                                        } else {
@@ -694,7 +706,7 @@ function doAdminNetworkProcessHandlenetworkForm () {
 }
 
 // Handle network type form
-function doAdminNetworkProcessHandlenetworktypeForm () {
+function doAdminNetworkProcessHandleNetworkTypeForm () {
        // Do we have selections?
        if (ifPostContainsSelections()) {
                // Load network data
@@ -746,7 +758,7 @@ function doAdminNetworkProcessHandlenetworktypeForm () {
 }
 
 // Handle network request parameter form
-function doAdminNetworkProcessHandlerequestparamsForm () {
+function doAdminNetworkProcessHandleRequestParamsForm () {
        // Do we have selections?
        if (ifPostContainsSelections()) {
                // Init cache array
@@ -804,7 +816,7 @@ function doAdminNetworkProcessHandlerequestparamsForm () {
 }
 
 // Changes given networks
-function doAdminNetworkProcessChangenetworkForm () {
+function doAdminNetworkProcessChangeNetworkForm () {
        // Do we have selections?
        if (ifPostContainsSelections()) {
                // By default nothing is updated
@@ -849,7 +861,7 @@ function doAdminNetworkProcessChangenetworkForm () {
 }
 
 // Removes given networks
-function doAdminNetworkProcessRemovenetworkForm () {
+function doAdminNetworkProcessRemoveNetworkForm () {
        // Do we have selections?
        if (ifPostContainsSelections()) {
                // By default nothing is removed
@@ -876,7 +888,7 @@ function doAdminNetworkProcessRemovenetworkForm () {
 }
 
 // Add a network type handler if not yet found
-function doAdminNetworkProcessAddnetworktypeForm () {
+function doAdminNetworkProcessAddNetworkTypeForm () {
        // Is the network type handle already used with given network?
        if (isNetworkTypeHandleValid(postRequestParameter('network_type_handle'), getRequestParameter('network'))) {
                // Already added
@@ -918,7 +930,7 @@ function doAdminNetworkProcessAddnetworktypeForm () {
 }
 
 // Changes given network type handlers
-function doAdminNetworkProcessChangenetworktypeForm () {
+function doAdminNetworkProcessChangeNetworkTypeForm () {
        // Do we have selections?
        if (ifPostContainsSelections()) {
                // By default nothing is updated
@@ -969,7 +981,7 @@ function doAdminNetworkProcessChangenetworktypeForm () {
 }
 
 // Changes given network request parameters
-function doAdminNetworkProcessChangenetworkparamForm () {
+function doAdminNetworkProcessChangeNetworkParamForm () {
        // Do we have selections?
        if (ifPostContainsSelections()) {
                // By default nothing is updated
@@ -1020,7 +1032,7 @@ function doAdminNetworkProcessChangenetworkparamForm () {
 }
 
 // Removes given network type handlers
-function doAdminNetworkProcessRemovenetworktypeForm () {
+function doAdminNetworkProcessRemoveNetworkTypeForm () {
        // Do we have selections?
        if (ifPostContainsSelections()) {
                // By default nothing is removed
@@ -1047,7 +1059,7 @@ function doAdminNetworkProcessRemovenetworktypeForm () {
 }
 
 // Removes given network request parameters
-function doAdminNetworkProcessRemovenetworkparamForm () {
+function doAdminNetworkProcessRemoveNetworkParamForm () {
        // Do we have selections?
        if (ifPostContainsSelections()) {
                // By default nothing is removed
@@ -1074,7 +1086,7 @@ function doAdminNetworkProcessRemovenetworkparamForm () {
 }
 
 // Adds a request parameter to given network and type
-function doAdminNetworkProcessAddnetworkparamForm () {
+function doAdminNetworkProcessAddNetworkParamForm () {
        // Is the request parameter already used with given network?
        if (isNetworkRequestParameterValid(postRequestParameter('request_param_key'), postRequestParameter('network_type_id'), getRequestParameter('network'))) {
                // Already added