Added purging of subid and server_name logs

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

diff --git a/inc/libs/network_functions.php b/inc/libs/network_functions.php
index 11ffff20e57c3b108602e02c1bdc44b3b67e1958..735b1a53355d6e3e1b5bae80c70c1f00d42c2a1a 100644 (file)
--- a/inc/libs/network_functions.php
+++ b/inc/libs/network_functions.php
@@ -743,6 +743,9 @@ function generateNetworkTypesAvailableOptions ($defaultType = NULL) {
                                'skybanner',
                                'skybanner_click',
                                'skybanner_view',
+                               'halfbanner',
+                               'halfbanner_click',
+                               'halfbanner_view',
                                'layer',
                                'layer_click',
                                'layer_view',
@@ -752,9 +755,13 @@ function generateNetworkTypesAvailableOptions ($defaultType = NULL) {
                                'htmlmail',
                                'lead',
                                'sale',
+                               'lead_sale',
                                'payperactive',
                                'pagepeel',
-                               'traffic'
+                               'traffic',
+                               'signature',
+                               'signature_click',
+                               'signature_view',
                        ),
                        array(),
                        $defaultType,
@@ -1129,11 +1136,7 @@ function doAdminNetworkProcessAddNetwork () {
                // Already there
                loadTemplate('admin_settings_unsaved', FALSE, '{%message,ADMIN_NETWORK_ALREADY_ADDED=' . postRequestElement('network_short_name') . '%}');
                return FALSE;
-       } elseif (!isNetworkActiveByShortName(postRequestElement('network_short_name'))) {
-               // Network is not active
-               loadTemplate('admin_settings_unsaved', FALSE, '{%message,ADMIN_NETWORK_NOT_ACTIVE=' . postRequestElement('network_short_name') . '%}');
-               return FALSE;
-       }
+       } // END - if
 
        // Remove the 'ok' part
        unsetPostRequestElement('ok');
@@ -1176,8 +1179,13 @@ function doAdminNetworkProcessHandleNetworks () {
 
                // If we have no rows, we don't need to display the edit form
                if (!empty($OUT)) {
+                       // Init array with generic element
+                       $content = array(
+                               'rows' => $OUT
+                       );
+
                        // Output main template
-                       loadTemplate('admin_' . $GLOBALS['network_form_name'] . '_networks', FALSE, $OUT);
+                       loadTemplate('admin_' . $GLOBALS['network_form_name'] . '_networks', FALSE, $content);
 
                        // Don't display the list/add new form
                        $GLOBALS['network_display'] = FALSE;
@@ -1221,11 +1229,17 @@ function doAdminNetworkProcessHandleNetworkTypes () {
 
                // If we have no rows, we don't need to display the edit form
                if (!empty($OUT)) {
+                       // Prepare array with generic elements
+                       $content = array(
+                               'rows'       => $OUT,
+                               'network_id' => bigintval(getRequestElement('network_id'))
+                       );
+
                        // Output main template
                        if (isFormSent('edit')) {
-                               loadTemplate('admin_edit_network_types', FALSE, $OUT);
+                               loadTemplate('admin_edit_network_types', FALSE, $content);
                        } elseif (isFormSent('delete')) {
-                               loadTemplate('admin_delete_network_types', FALSE, $OUT);
+                               loadTemplate('admin_delete_network_types', FALSE, $content);
                        } else {
                                // Problem!
                                reportBug(__FUNCTION__, __LINE__, 'Cannot detect edit/delete.');
@@ -1279,11 +1293,17 @@ function doAdminNetworkProcessHandleRequestParams () {
 
                // If we have no rows, we don't need to display the edit form
                if (!empty($OUT)) {
+                       // Prepare array with generic elements
+                       $content = array(
+                               'rows'       => $OUT,
+                               'network_id' => bigintval(getRequestElement('network_id'))
+                       );
+
                        // Output main template
                        if (isFormSent('edit')) {
-                               loadTemplate('admin_edit_network_request_params', FALSE, $OUT);
+                               loadTemplate('admin_edit_network_request_params', FALSE, $content);
                        } elseif (isFormSent('delete')) {
-                               loadTemplate('admin_delete_network_request_params', FALSE, $OUT);
+                               loadTemplate('admin_delete_network_request_params', FALSE, $content);
                        } else {
                                // Problem!
                                reportBug(__FUNCTION__, __LINE__, 'Cannot detect edit/delete.');
@@ -1799,11 +1819,17 @@ function doAdminNetworkProcessHandleArrayTranslations () {
 
                // If we have no rows, we don't need to display the edit form
                if (!empty($OUT)) {
+                       // Prepare array with generic elements
+                       $content = array(
+                               'rows'       => $OUT,
+                               'network_id' => bigintval(getRequestElement('network_id'))
+                       );
+
                        // Output main template
                        if (isFormSent('edit')) {
-                               loadTemplate('admin_edit_network_array_translation', FALSE, $OUT);
+                               loadTemplate('admin_edit_network_array_translation', FALSE, $content);
                        } elseif (isFormSent('delete')) {
-                               loadTemplate('admin_delete_network_array_translation', FALSE, $OUT);
+                               loadTemplate('admin_delete_network_array_translation', FALSE, $content);
                        } else {
                                // Problem!
                                reportBug(__FUNCTION__, __LINE__, 'Cannot detect edit/delete.');
@@ -1967,7 +1993,7 @@ function doAdminNetworkProcessEditHandlerTypesConfig ($displayMessage = TRUE) {
        } // END - foreach
 
        // Convert time selections in POST data
-       convertSelectionsToEpocheTimeInPostArray('network_max_reload_time_ye');
+       convertSelectionsToEpocheTimeInPostData('network_max_reload_time_ye');
 
        // Is there already an entry?
        if (!isNetworkTypeHandlerConfigured(getRequestElement('network_id'), getRequestElement('network_type_id'))) {