Configuration of advertisement networks prepared, CSS cleaned up, HTML rewritten:

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

diff --git a/inc/libs/network_functions.php b/inc/libs/network_functions.php
index ae47871fa8b25d058b8dfc3603d721258facfe6f..b9a799df08d1523696962c3e1e8ed037012caab4 100644 (file)
--- a/inc/libs/network_functions.php
+++ b/inc/libs/network_functions.php
@@ -55,7 +55,7 @@ function getCurrentNetworkId () {
 // Handle a (maybe) sent form here
 function doNetworkHandleForm () {
        // Was the form sent?
-       if ((isFormSent()) || (isFormSent('edit')) || (isFormSent('del')) || (isFormSent('change')) || (isFormSent('remove'))) {
+       if ((isFormSent()) || (isFormSent('edit')) || (isFormSent('delete')) || (isFormSent('change')) || (isFormSent('remove'))) {
                // Do we have a 'do'?
                if (isGetRequestParameterSet('do')) {
                        // Process the request
@@ -70,7 +70,7 @@ function doNetworkHandleForm () {
 // Processes an admin form
 function doAdminNetworkProcessForm () {
        // Form really sent?
-       if ((!isFormSent()) && (!isFormSent('edit')) && (!isFormSent('del')) && (!isFormSent('change')) && (!isFormSent('remove'))) {
+       if ((!isFormSent()) && (!isFormSent('edit')) && (!isFormSent('delete')) && (!isFormSent('change')) && (!isFormSent('remove'))) {
                // Abort here
                loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_FORM_NOT_SENT--}');
                return;
@@ -653,6 +653,29 @@ function generateNetworkRequestTypeOptions ($default = '') {
        return $GLOBALS[__FUNCTION__][$default];
 }
 
+// Generates an option list of network_active
+function generateNetworkActiveOptions ($default = '') {
+       // Do we have cache?
+       if (!isset($GLOBALS[__FUNCTION__][$default])) {
+               // Generate the list
+               $GLOBALS[__FUNCTION__][$default] = generateOptionList(
+                       '/ARRAY/',
+                       array(
+                               'Y',
+                               'N'
+                       ),
+                       array(
+                               '{--YES--}',
+                               '{--NO--}'
+                       ),
+                       $default
+               );
+       } // END - if
+
+       // Return cache
+       return $GLOBALS[__FUNCTION__][$default];
+}
+
 // Translates 'translate_name' for e.g. templates
 function translateNetworkTranslationName ($name) {
        // Get the message id
@@ -777,9 +800,9 @@ function doAdminNetworkProcessHandleNetwork () {
                                        if (isFormSent('edit')) {
                                                // Add row template for editing
                                                $OUT .= loadTemplate('admin_edit_networks_row', true, $networkData);
-                                       } elseif (isFormSent('del')) {
+                                       } elseif (isFormSent('delete')) {
                                                // Add row template for deleting
-                                               $OUT .= loadTemplate('admin_del_networks_row', true, $networkData);
+                                               $OUT .= loadTemplate('admin_delete_networks_row', true, $networkData);
                                        } else {
                                                // Problem!
                                                debug_report_bug(__FUNCTION__, __LINE__, 'Cannot detect edit/del.');
@@ -793,8 +816,8 @@ function doAdminNetworkProcessHandleNetwork () {
                        // Output main template
                        if (isFormSent('edit')) {
                                loadTemplate('admin_edit_networks', false, $OUT);
-                       } elseif (isFormSent('del')) {
-                               loadTemplate('admin_del_networks', false, $OUT);
+                       } elseif (isFormSent('delete')) {
+                               loadTemplate('admin_delete_networks', false, $OUT);
                        } else {
                                // Problem!
                                debug_report_bug(__FUNCTION__, __LINE__, 'Cannot detect edit/del.');
@@ -829,9 +852,9 @@ function doAdminNetworkProcessHandleNetworkType () {
                                        if (isFormSent('edit')) {
                                                // Add row template for deleting
                                                $OUT .= loadTemplate('admin_edit_network_types_row', true, $networkTypeData);
-                                       } elseif (isFormSent('del')) {
+                                       } elseif (isFormSent('delete')) {
                                                // Add row template for deleting
-                                               $OUT .= loadTemplate('admin_del_network_types_row', true, $networkTypeData);
+                                               $OUT .= loadTemplate('admin_delete_network_types_row', true, $networkTypeData);
                                        } else {
                                                // Problem!
                                                debug_report_bug(__FUNCTION__, __LINE__, 'Cannot detect edit/del.');
@@ -845,8 +868,8 @@ function doAdminNetworkProcessHandleNetworkType () {
                        // Output main template
                        if (isFormSent('edit')) {
                                loadTemplate('admin_edit_network_types', false, $OUT);
-                       } elseif (isFormSent('del')) {
-                               loadTemplate('admin_del_network_types', false, $OUT);
+                       } elseif (isFormSent('delete')) {
+                               loadTemplate('admin_delete_network_types', false, $OUT);
                        } else {
                                // Problem!
                                debug_report_bug(__FUNCTION__, __LINE__, 'Cannot detect edit/del.');
@@ -884,12 +907,12 @@ function doAdminNetworkProcessHandleRequestParams () {
                                        if (isFormSent('edit')) {
                                                // Add row template for deleting
                                                $OUT .= loadTemplate('admin_edit_network_params_row', true, $networkRequestData);
-                                       } elseif (isFormSent('del')) {
+                                       } elseif (isFormSent('delete')) {
                                                // Get type data
                                                $networkRequestData['network_type_data'] = getNetworkTypeDataById($networkRequestData['network_type_id']);
 
                                                // Add row template for deleting
-                                               $OUT .= loadTemplate('admin_del_network_params_row', true, $networkRequestData);
+                                               $OUT .= loadTemplate('admin_delete_network_params_row', true, $networkRequestData);
                                        } else {
                                                // Problem!
                                                debug_report_bug(__FUNCTION__, __LINE__, 'Cannot detect edit/del.');
@@ -903,8 +926,8 @@ function doAdminNetworkProcessHandleRequestParams () {
                        // Output main template
                        if (isFormSent('edit')) {
                                loadTemplate('admin_edit_network_params', false, $OUT);
-                       } elseif (isFormSent('del')) {
-                               loadTemplate('admin_del_network_params', false, $OUT);
+                       } elseif (isFormSent('delete')) {
+                               loadTemplate('admin_delete_network_params', false, $OUT);
                        } else {
                                // Problem!
                                debug_report_bug(__FUNCTION__, __LINE__, 'Cannot detect edit/del.');