Some improvements:

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

diff --git a/inc/libs/network_functions.php b/inc/libs/network_functions.php
index 4752ac40c13d60b07e616ecb6d0736bcd7823a34..1ec81ad88917f19e1bbe9894293b42af3b97d163 100644 (file)
--- a/inc/libs/network_functions.php
+++ b/inc/libs/network_functions.php
@@ -62,11 +62,14 @@ function detectNetworkProcessForm () {
        $GLOBALS['network_form_name'] = 'invalid';
 
        // Now search all valid
-       foreach (array('ok', 'edit', 'delete', 'do_edit', 'do_delete') as $form) {
+       foreach (array('save_config', 'add', 'edit', 'delete', 'do_edit', 'do_delete') as $formName) {
                // Is it detected
-               if (isFormSent($form)) {
+               if (isFormSent($formName)) {
                        // Use this form name
-                       $GLOBALS['network_form_name'] = $form;
+                       $GLOBALS['network_form_name'] = $formName;
+
+                       // Remove it generically here
+                       unsetPostRequestElement($formName);
 
                        // Abort loop
                        break;
@@ -76,7 +79,7 @@ function detectNetworkProcessForm () {
        // Has the form being detected?
        if ($GLOBALS['network_form_name'] == 'invalid') {
                // Not supported
-               reportBug(__FUNCTION__, __LINE__, 'POST form could not be detected.');
+               reportBug(__FUNCTION__, __LINE__, 'POST form could not be detected, postData=<pre>' . print_r(postRequestArray(), TRUE));
        } // END - if
 }
 
@@ -743,6 +746,9 @@ function generateNetworkTypesAvailableOptions ($defaultType = NULL) {
                                'skybanner',
                                'skybanner_click',
                                'skybanner_view',
+                               'halfbanner',
+                               'halfbanner_click',
+                               'halfbanner_view',
                                'layer',
                                'layer_click',
                                'layer_view',
@@ -752,6 +758,7 @@ function generateNetworkTypesAvailableOptions ($defaultType = NULL) {
                                'htmlmail',
                                'lead',
                                'sale',
+                               'lead_sale',
                                'payperactive',
                                'pagepeel',
                                'traffic',
@@ -1132,14 +1139,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;
-       }
-
-       // Remove the 'ok' part
-       unsetPostRequestElement('ok');
+       } // END - if
 
        // Add the whole request to database
        SQL_QUERY(getInsertSqlFromArray(postRequestArray(), 'network_data'), __FUNCTION__, __LINE__);
@@ -1179,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;
@@ -1224,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.');
@@ -1282,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.');
@@ -1386,14 +1403,11 @@ function doAdminNetworkProcessAddNetworkType () {
                return FALSE;
        } // END - if
 
-       // Remove the 'ok' part
-       unsetPostRequestElement('ok');
-
        // Add id
        setPostRequestElement('network_id', bigintval(getRequestElement('network_id')));
 
        // Is network_type_banner_url set?
-       if (postRequestElement('network_type_banner_url') == '') {
+       if (!isPostRequestElementSet('network_type_banner_url')) {
                // Remove empty value to get a NULL for an optional entry
                unsetPostRequestElement('network_type_banner_url');
        } // END - if
@@ -1662,14 +1676,11 @@ function doAdminNetworkProcessAddRequestParam () {
                return FALSE;
        } // END - if
 
-       // Remove the 'ok' part
-       unsetPostRequestElement('ok');
-
        // Add id
        setPostRequestElement('network_id', bigintval(getRequestElement('network_id')));
 
        // Is network_request_param_default set?
-       if (postRequestElement('network_request_param_default') == '') {
+       if (!isPostRequestElementSet('network_request_param_default')) {
                // Remove empty value to get a NULL for an optional entry
                unsetPostRequestElement('network_request_param_default');
        } // END - if
@@ -1698,14 +1709,11 @@ function doAdminNetworkProcessAddVcheckParam () {
                return FALSE;
        } // END - if
 
-       // Remove the 'ok' part
-       unsetPostRequestElement('ok');
-
        // Add id
        setPostRequestElement('network_id', bigintval(getRequestElement('network_id')));
 
        // Is network_vcheck_param_default set?
-       if (postRequestElement('network_vcheck_param_default') == '') {
+       if (!isPostRequestElementSet('network_vcheck_param_default')) {
                // Remove empty value to get a NULL for an optional entry
                unsetPostRequestElement('network_vcheck_param_default');
        } // END - if
@@ -1734,9 +1742,6 @@ function doAdminNetworkProcessAddNetworkArrayTranslation () {
                return FALSE;
        } // END - if
 
-       // Remove the 'ok' part
-       unsetPostRequestElement('ok');
-
        // Add id
        setPostRequestElement('network_id', bigintval(getRequestElement('network_id')));
 
@@ -1802,11 +1807,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.');
@@ -1823,14 +1834,11 @@ function doAdminNetworkProcessHandleArrayTranslations () {
 
 // Adds/update network API configuration
 function doAdminNetworkProcessNetworkApiConfig () {
-       // Remove the 'ok' part
-       unsetPostRequestElement('ok');
-
        // Add id
        setPostRequestElement('network_id', bigintval(getRequestElement('network_id')));
 
        // Is network_api_referral_button set?
-       if (postRequestElement('network_api_referral_button') == '') {
+       if (!isPostRequestElementSet('network_api_referral_button')) {
                // Remove empty value to get a NULL for an optional entry
                unsetPostRequestElement('network_api_referral_button');
        } // END - if
@@ -1859,27 +1867,27 @@ function doAdminNetworkProcessNetworkApiConfig () {
 
 // Only adds network type configuration if not yet present
 function doAdminNetworkProcessAddHandlerTypesConfig ($displayMessage = TRUE) {
-       // Remove the 'ok' part
-       unsetPostRequestElement('ok');
-
        // Add both ids
        setPostRequestElement('network_id', bigintval(getRequestElement('network_id')));
        setPostRequestElement('network_type_id', bigintval(getRequestElement('network_type_id')));
 
+       // Translate German comma to dot
+       convertCommaToDotInPostData('network_min_payment');
+
        /*
         * Some parameters are optional, at least one must be given so check a bunch
         * of parameters.
         */
        foreach (array('network_min_waiting_time', 'network_min_remain_clicks', 'network_min_payment', 'network_allow_erotic') as $element) {
                // Is this element empty?
-               if (postRequestElement($element) == '') {
+               if (!isPostRequestElementSet($element)) {
                        // Then unset it to get a NULL for optional parameter
                        unsetPostRequestElement($element);
                } // END - if
        } // END - foreach
 
        // Convert data in POST array
-       convertSelectionsToEpocheTimeInPostData($content, 'network_max_reload_time_ye', $skip);
+       convertSelectionsToEpocheTimeInPostData('network_max_reload_time_ye');
 
        // Is there already an entry?
        if (isNetworkTypeHandlerConfigured(getRequestElement('network_id'), getRequestElement('network_type_id'))) {
@@ -1954,8 +1962,8 @@ function doAdminNetworkProcessAddHandlerTypesConfig ($displayMessage = TRUE) {
 
 // Only changes network type configuration if not yet present
 function doAdminNetworkProcessEditHandlerTypesConfig ($displayMessage = TRUE) {
-       // Remove the 'ok' part
-       unsetPostRequestElement('ok');
+       // Translate German comma to dot
+       convertCommaToDotInPostData('network_min_payment');
 
        /*
         * Some parameters are optional, at least one must be given so check a bunch
@@ -1963,14 +1971,14 @@ function doAdminNetworkProcessEditHandlerTypesConfig ($displayMessage = TRUE) {
         */
        foreach (array('network_min_waiting_time', 'network_min_remain_clicks', 'network_min_payment', 'network_allow_erotic') as $element) {
                // Is this element empty?
-               if (postRequestElement($element) == '') {
+               if (!isPostRequestElementSet($element)) {
                        // Then unset it to get a NULL for optional parameter
                        unsetPostRequestElement($element);
                } // END - if
        } // 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'))) {