]> git.mxchange.org Git - mailer.git/blobdiff - inc/libs/network_functions.php
Some improvements:
[mailer.git] / inc / libs / network_functions.php
index 0e184b9d39ca5e48df9a5000f20b6a44490935be..1ec81ad88917f19e1bbe9894293b42af3b97d163 100644 (file)
@@ -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
 }
 
@@ -103,7 +106,7 @@ function doAdminNetworkProcessForm () {
        // Is the function valid?
        if (!function_exists($functionName)) {
                // Invalid function name
-               reportBug(__FUNCTION__, __LINE__, 'Invalid do ' . getRequestElement('do') . ', function ' . $functionName .' does not exist.', false);
+               reportBug(__FUNCTION__, __LINE__, 'Invalid do ' . getRequestElement('do') . ', function ' . $functionName .' does not exist.', FALSE);
        } // END - if
 
        // Init global arrays
@@ -118,7 +121,7 @@ function isNetworkNameValid ($name) {
        // Is there cache?
        if (!isset($GLOBALS[__FUNCTION__][$name])) {
                // Does it exist?
-               $GLOBALS[__FUNCTION__][$name] = (countSumTotalData($name, 'network_data', 'network_id', 'network_short_name', true) == 1);
+               $GLOBALS[__FUNCTION__][$name] = (countSumTotalData($name, 'network_data', 'network_id', 'network_short_name', TRUE) == 1);
        } // END - if
 
        // Return result
@@ -130,7 +133,7 @@ function isNetworkActiveByShortName ($name) {
        // Is there cache?
        if (!isset($GLOBALS[__FUNCTION__][$name])) {
                // Does it exist?
-               $GLOBALS[__FUNCTION__][$name] = ((isNetworkNameValid($name)) && (countSumTotalData($name, 'network_data', 'network_id', 'network_short_name', true, " AND `network_active`='Y'") == 1));
+               $GLOBALS[__FUNCTION__][$name] = ((isNetworkNameValid($name)) && (countSumTotalData($name, 'network_data', 'network_id', 'network_short_name', TRUE, " AND `network_active`='Y'") == 1));
        } // END - if
 
        // Return result
@@ -142,7 +145,7 @@ function isNetworkActiveById ($networkId) {
        // Is there cache?
        if (!isset($GLOBALS[__FUNCTION__][$networkId])) {
                // Does it exist?
-               $GLOBALS[__FUNCTION__][$networkId] = (countSumTotalData(bigintval($networkId), 'network_data', 'network_id', 'network_id', true, " AND `network_active`='Y'") == 1);
+               $GLOBALS[__FUNCTION__][$networkId] = (countSumTotalData(bigintval($networkId), 'network_data', 'network_id', 'network_id', TRUE, " AND `network_active`='Y'") == 1);
        } // END - if
 
        // Return result
@@ -498,7 +501,7 @@ function doNetworkUpdateDataByArray ($networkId, $networkData) {
        } // END - if
 
        // Just call our inner method
-       return adminSaveSettings($networkData, '_network_data', sprintf("`network_id`=%s", bigintval($networkId)), array(), false, false);
+       return adminSaveSettings($networkData, '_network_data', sprintf("`network_id`=%s", bigintval($networkId)), array(), FALSE, FALSE);
 }
 
 // Updates given network type handler (id) with data from array
@@ -510,7 +513,7 @@ function doNetworkUpdateTypeByArray ($networkTypeId, $networkTypeData) {
        } // END - if
 
        // Just call our inner method
-       return adminSaveSettings($networkTypeData, '_network_types', sprintf("`network_type_id`=%s", bigintval($networkTypeId)), array(), false, false);
+       return adminSaveSettings($networkTypeData, '_network_types', sprintf("`network_type_id`=%s", bigintval($networkTypeId)), array(), FALSE, FALSE);
 }
 
 // Updates given network request parameters (id) with data from array
@@ -522,7 +525,7 @@ function doNetworkUpdateParamsByArray ($networkParamsId, $networkParamsData) {
        } // END - if
 
        // Just call our inner method
-       return adminSaveSettings($networkParamsData, '_network_request_params', sprintf("`network_request_param_id`=%s", bigintval($networkParamsId)), array(), false, false);
+       return adminSaveSettings($networkParamsData, '_network_request_params', sprintf("`network_request_param_id`=%s", bigintval($networkParamsId)), array(), FALSE, FALSE);
 }
 
 // Updates given network array translations (id) with data from array
@@ -534,7 +537,7 @@ function doNetworkUpdateArrayTranslationsByArray ($networkTranslationsId, $netwo
        } // END - if
 
        // Just call our inner method
-       return adminSaveSettings($networkTranslationsData, '_network_array_translation', sprintf("`network_array_id`=%s", bigintval($networkTranslationsId)), array(), false, false);
+       return adminSaveSettings($networkTranslationsData, '_network_array_translation', sprintf("`network_array_id`=%s", bigintval($networkTranslationsId)), array(), FALSE, FALSE);
 }
 
 // Removes given network entry
@@ -584,7 +587,7 @@ ORDER BY
                $content = generateSelectionBoxFromArray($rows, 'network_id', 'network_id', '', '', 'network');
        } else {
                // Nothing selected
-               $content = loadTemplate('admin_settings_unsaved', false, '{--ADMIN_ENTRIES_404--}');
+               $content = loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_ENTRIES_404--}');
        }
 
        // Free the result
@@ -630,7 +633,7 @@ ORDER BY
                $content = generateSelectionBoxFromArray($rows, 'network_type', 'network_type_id');
        } else {
                // Nothing selected
-               $content = loadTemplate('admin_settings_unsaved', false, '{--ADMIN_ENTRIES_404--}');
+               $content = loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_ENTRIES_404--}');
        }
 
        // Free the result
@@ -677,7 +680,7 @@ ORDER BY
                $content = generateSelectionBoxFromArray($rows, 'network_type', 'network_type_id', '', '_title');
        } else {
                // Nothing selected
-               $content = loadTemplate('admin_settings_unsaved', false, '{--ADMIN_ENTRIES_404--}');
+               $content = loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_ENTRIES_404--}');
        }
 
        // Free the result
@@ -743,6 +746,9 @@ function generateNetworkTypesAvailableOptions ($defaultType = NULL) {
                                'skybanner',
                                'skybanner_click',
                                'skybanner_view',
+                               'halfbanner',
+                               'halfbanner_click',
+                               'halfbanner_view',
                                'layer',
                                'layer_click',
                                'layer_view',
@@ -752,9 +758,13 @@ function generateNetworkTypesAvailableOptions ($defaultType = NULL) {
                                'htmlmail',
                                'lead',
                                'sale',
+                               'lead_sale',
                                'payperactive',
                                'pagepeel',
-                               'traffic'
+                               'traffic',
+                               'signature',
+                               'signature_click',
+                               'signature_view',
                        ),
                        array(),
                        $defaultType,
@@ -1127,16 +1137,9 @@ function doAdminNetworkProcessAddNetwork () {
        // We can say here, the form is sent, so check if the network is already added
        if (isNetworkNameValid(postRequestElement('network_short_name'))) {
                // 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');
+               loadTemplate('admin_settings_unsaved', FALSE, '{%message,ADMIN_NETWORK_ALREADY_ADDED=' . postRequestElement('network_short_name') . '%}');
+               return FALSE;
+       } // END - if
 
        // Add the whole request to database
        SQL_QUERY(getInsertSqlFromArray(postRequestArray(), 'network_data'), __FUNCTION__, __LINE__);
@@ -1147,10 +1150,10 @@ function doAdminNetworkProcessAddNetwork () {
        // Output message
        if (!SQL_HASZEROAFFECTED()) {
                // Successfully added
-               loadTemplate('admin_network_added', false, postRequestArray());
+               loadTemplate('admin_network_added', FALSE, postRequestArray());
        } else {
                // Not added
-               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_DATA_NOT_ADDED=' . postRequestElement('network_short_name') . '%}');
+               loadTemplate('admin_settings_unsaved', FALSE, '{%message,ADMIN_NETWORK_DATA_NOT_ADDED=' . postRequestElement('network_short_name') . '%}');
        }
 }
 
@@ -1169,21 +1172,26 @@ function doAdminNetworkProcessHandleNetworks () {
                                // Is there found the network?
                                if (count($networkData) > 0) {
                                        // Add row template with given form name
-                                       $OUT .= loadTemplate('admin_' . $GLOBALS['network_form_name'] . '_networks_row', true, $networkData);
+                                       $OUT .= loadTemplate('admin_' . $GLOBALS['network_form_name'] . '_networks_row', TRUE, $networkData);
                                } // END - if
                        } // END - if
                } // END - foreach
 
                // 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;
+                       $GLOBALS['network_display'] = FALSE;
                } else {
                        // Nothing selected/found
-                       loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_NOTHING_FOUND--}');
+                       loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_NETWORK_NOTHING_FOUND--}');
                }
        } // END - if
 }
@@ -1207,10 +1215,10 @@ function doAdminNetworkProcessHandleNetworkTypes () {
                                if (count($networkTypeData) > 0) {
                                        if (isFormSent('edit')) {
                                                // Add row template for deleting
-                                               $OUT .= loadTemplate('admin_edit_network_types_row', true, $networkTypeData);
+                                               $OUT .= loadTemplate('admin_edit_network_types_row', TRUE, $networkTypeData);
                                        } elseif (isFormSent('delete')) {
                                                // Add row template for deleting
-                                               $OUT .= loadTemplate('admin_delete_network_types_row', true, $networkTypeData);
+                                               $OUT .= loadTemplate('admin_delete_network_types_row', TRUE, $networkTypeData);
                                        } else {
                                                // Problem!
                                                reportBug(__FUNCTION__, __LINE__, 'Cannot detect edit/delete.');
@@ -1221,21 +1229,27 @@ 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.');
                        }
 
                        // Don't display the list/add new form
-                       $GLOBALS['network_display'] = false;
+                       $GLOBALS['network_display'] = FALSE;
                } else {
                        // Nothing selected/found
-                       loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_TYPE_HANDLER_NOTHING_FOUND--}');
+                       loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_NETWORK_TYPE_HANDLER_NOTHING_FOUND--}');
                }
        } // END - if
 }
@@ -1262,13 +1276,13 @@ function doAdminNetworkProcessHandleRequestParams () {
                                if (count($networkRequestData) > 0) {
                                        if (isFormSent('edit')) {
                                                // Add row template for deleting
-                                               $OUT .= loadTemplate('admin_edit_network_request_params_row', true, $networkRequestData);
+                                               $OUT .= loadTemplate('admin_edit_network_request_params_row', TRUE, $networkRequestData);
                                        } elseif (isFormSent('delete')) {
                                                // Get type data
                                                $networkRequestData['network_type_data'] = getNetworkTypeDataById($networkRequestData['network_type_id']);
 
                                                // Add row template for deleting
-                                               $OUT .= loadTemplate('admin_delete_network_request_params_row', true, $networkRequestData);
+                                               $OUT .= loadTemplate('admin_delete_network_request_params_row', TRUE, $networkRequestData);
                                        } else {
                                                // Problem!
                                                reportBug(__FUNCTION__, __LINE__, 'Cannot detect edit/delete.');
@@ -1279,21 +1293,27 @@ 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.');
                        }
 
                        // Don't display the list/add new form
-                       $GLOBALS['network_display'] = false;
+                       $GLOBALS['network_display'] = FALSE;
                } else {
                        // Nothing selected/found
-                       loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_REQUEST_PARAMETER_NOTHING_FOUND--}');
+                       loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_NETWORK_REQUEST_PARAMETER_NOTHING_FOUND--}');
                }
        } // END - if
 }
@@ -1340,7 +1360,7 @@ function doAdminNetworkProcessChangeNetworks () {
                        displayMessage('{%message,ADMIN_NETWORK_UPDATED=' . $updated . '%}');
                } else {
                        // Nothing changed
-                       loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_NOTHING_CHANGED--}');
+                       loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_NETWORK_NOTHING_CHANGED--}');
                }
        } // END - if
 }
@@ -1367,7 +1387,7 @@ function doAdminNetworkProcessRemoveNetworks () {
                        displayMessage('{%message,ADMIN_NETWORK_REMOVED=' . $removed . '%}');
                } else {
                        // Nothing removed
-                       loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_NOTHING_REMOVED--}');
+                       loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_NETWORK_NOTHING_REMOVED--}');
                }
        } // END - if
 }
@@ -1377,20 +1397,17 @@ function doAdminNetworkProcessAddNetworkType () {
        // Is the network type handle already used with given network?
        if (isNetworkTypeHandleValid(postRequestElement('network_type_handler'), getRequestElement('network_id'))) {
                // Already added
-               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_TYPE_HANDLER_ALREADY_ADDED=' . postRequestElement('network_type_handler') . '%}');
+               loadTemplate('admin_settings_unsaved', FALSE, '{%message,ADMIN_NETWORK_TYPE_HANDLER_ALREADY_ADDED=' . postRequestElement('network_type_handler') . '%}');
 
                // ... so abort here
-               return false;
+               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
@@ -1401,10 +1418,10 @@ function doAdminNetworkProcessAddNetworkType () {
        // Output message
        if (!SQL_HASZEROAFFECTED()) {
                // Successfully added
-               loadTemplate('admin_network_type_added', false, postRequestArray());
+               loadTemplate('admin_network_type_added', FALSE, postRequestArray());
        } else {
                // Not added
-               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_TYPE_HANDLER_NOT_ADDED=' . postRequestElement('network_type_handler') . '%}');
+               loadTemplate('admin_settings_unsaved', FALSE, '{%message,ADMIN_NETWORK_TYPE_HANDLER_NOT_ADDED=' . postRequestElement('network_type_handler') . '%}');
        }
 }
 
@@ -1456,7 +1473,7 @@ function doAdminNetworkProcessChangeHandlerTypes () {
                        displayMessage('{%message,ADMIN_NETWORK_TYPE_HANDLER_UPDATED=' . $updated . '%}');
                } else {
                        // Nothing changed
-                       loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_TYPE_HANDLER_NOTHING_CHANGED--}');
+                       loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_NETWORK_TYPE_HANDLER_NOTHING_CHANGED--}');
                }
        } // END - if
 }
@@ -1509,7 +1526,7 @@ function doAdminNetworkProcessChangeRequestParams () {
                        displayMessage('{%message,ADMIN_NETWORK_REQUEST_PARAMETER_UPDATED=' . $updated . '%}');
                } else {
                        // Nothing changed
-                       loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_REQUEST_PARAMETER_NOTHING_CHANGED--}');
+                       loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_NETWORK_REQUEST_PARAMETER_NOTHING_CHANGED--}');
                }
        } // END - if
 }
@@ -1562,7 +1579,7 @@ function doAdminNetworkProcessChangeArrayTranslations () {
                        displayMessage('{%message,ADMIN_NETWORK_ARRAY_TRANSLATION_UPDATED=' . $updated . '%}');
                } else {
                        // Nothing changed
-                       loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_ARRAY_TRANSLATION_NOTHING_CHANGED--}');
+                       loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_NETWORK_ARRAY_TRANSLATION_NOTHING_CHANGED--}');
                }
        } // END - if
 }
@@ -1589,7 +1606,7 @@ function doAdminNetworkProcessRemoveNetworkTypes () {
                        displayMessage('{%message,ADMIN_NETWORK_TYPE_HANDLER_REMOVED=' . $removed . '%}');
                } else {
                        // Nothing removed
-                       loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_TYPE_HANDLER_NOTHING_REMOVED--}');
+                       loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_NETWORK_TYPE_HANDLER_NOTHING_REMOVED--}');
                }
        } // END - if
 }
@@ -1616,7 +1633,7 @@ function doAdminNetworkProcessRemoveNetworkRequestParams () {
                        displayMessage('{%message,ADMIN_NETWORK_REQUEST_PARAMETER_REMOVED=' . $removed . '%}');
                } else {
                        // Nothing removed
-                       loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_REQUEST_PARAMETER_NOTHING_REMOVED--}');
+                       loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_NETWORK_REQUEST_PARAMETER_NOTHING_REMOVED--}');
                }
        } // END - if
 }
@@ -1643,7 +1660,7 @@ function doAdminNetworkProcessRemoveNetworkArrayTranslation () {
                        displayMessage('{%message,ADMIN_NETWORK_ARRAY_TRANSLATION_REMOVED=' . $removed . '%}');
                } else {
                        // Nothing removed
-                       loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_ARRAY_TRANSLATION_NOTHING_REMOVED--}');
+                       loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_NETWORK_ARRAY_TRANSLATION_NOTHING_REMOVED--}');
                }
        } // END - if
 }
@@ -1653,20 +1670,17 @@ function doAdminNetworkProcessAddRequestParam () {
        // Is the request parameter already used with given network?
        if (isNetworkRequestElementValid(postRequestElement('network_request_param_key'), postRequestElement('network_type_id'), getRequestElement('network_id'))) {
                // Already added
-               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_REQUEST_PARAMETER_ALREADY_ADDED=' . postRequestElement('network_request_param_key') . '%}');
+               loadTemplate('admin_settings_unsaved', FALSE, '{%message,ADMIN_NETWORK_REQUEST_PARAMETER_ALREADY_ADDED=' . postRequestElement('network_request_param_key') . '%}');
 
                // ... so abort here
-               return false;
+               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
@@ -1677,10 +1691,10 @@ function doAdminNetworkProcessAddRequestParam () {
        // Output message
        if (!SQL_HASZEROAFFECTED()) {
                // Successfully added
-               loadTemplate('admin_network_request_param_added', false, postRequestArray());
+               loadTemplate('admin_network_request_param_added', FALSE, postRequestArray());
        } else {
                // Not added
-               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_REQUEST_PARAMETER_NOT_ADDED=' . postRequestElement('network_request_param_key') . '%}');
+               loadTemplate('admin_settings_unsaved', FALSE, '{%message,ADMIN_NETWORK_REQUEST_PARAMETER_NOT_ADDED=' . postRequestElement('network_request_param_key') . '%}');
        }
 }
 
@@ -1689,20 +1703,17 @@ function doAdminNetworkProcessAddVcheckParam () {
        // Is the request parameter already used with given network?
        if (isNetworkVcheckElementValid(postRequestElement('network_vcheck_param_key'), getRequestElement('network_id'))) {
                // Already added
-               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_VCHECK_PARAMETER_ALREADY_ADDED=' . postRequestElement('network_vcheck_param_key') . '%}');
+               loadTemplate('admin_settings_unsaved', FALSE, '{%message,ADMIN_NETWORK_VCHECK_PARAMETER_ALREADY_ADDED=' . postRequestElement('network_vcheck_param_key') . '%}');
 
                // ... so abort here
-               return false;
+               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
@@ -1713,10 +1724,10 @@ function doAdminNetworkProcessAddVcheckParam () {
        // Output message
        if (!SQL_HASZEROAFFECTED()) {
                // Successfully added
-               loadTemplate('admin_network_vcheck_param_added', false, postRequestArray());
+               loadTemplate('admin_network_vcheck_param_added', FALSE, postRequestArray());
        } else {
                // Not added
-               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_VCHECK_PARAMETER_NOT_ADDED=' . postRequestElement('network_vcheck_param_key') . '%}');
+               loadTemplate('admin_settings_unsaved', FALSE, '{%message,ADMIN_NETWORK_VCHECK_PARAMETER_NOT_ADDED=' . postRequestElement('network_vcheck_param_key') . '%}');
        }
 }
 
@@ -1725,15 +1736,12 @@ function doAdminNetworkProcessAddNetworkArrayTranslation () {
        // Is the request parameter already used with given network?
        if (isNetworkArrayTranslationValid(postRequestElement('network_array_index'), postRequestElement('network_type_id'), getRequestElement('network_id'))) {
                // Already added
-               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_ARRAY_TRANSLATION_ALREADY_ADDED=' . postRequestElement('network_array_index') . '%}');
+               loadTemplate('admin_settings_unsaved', FALSE, '{%message,ADMIN_NETWORK_ARRAY_TRANSLATION_ALREADY_ADDED=' . postRequestElement('network_array_index') . '%}');
 
                // ... so abort here
-               return false;
+               return FALSE;
        } // END - if
 
-       // Remove the 'ok' part
-       unsetPostRequestElement('ok');
-
        // Add id
        setPostRequestElement('network_id', bigintval(getRequestElement('network_id')));
 
@@ -1753,10 +1761,10 @@ function doAdminNetworkProcessAddNetworkArrayTranslation () {
        // Output message
        if (!SQL_HASZEROAFFECTED()) {
                // Successfully added
-               loadTemplate('admin_network_array_translation_added', false, postRequestArray());
+               loadTemplate('admin_network_array_translation_added', FALSE, postRequestArray());
        } else {
                // Not added
-               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_ARRAY_TRANSLATION_NOT_ADDED=' . postRequestElement('network_array_index') . '%}');
+               loadTemplate('admin_settings_unsaved', FALSE, '{%message,ADMIN_NETWORK_ARRAY_TRANSLATION_NOT_ADDED=' . postRequestElement('network_array_index') . '%}');
        }
 }
 
@@ -1782,13 +1790,13 @@ function doAdminNetworkProcessHandleArrayTranslations () {
                                if (count($networkTranslationsData) > 0) {
                                        if (isFormSent('edit')) {
                                                // Add row template for deleting
-                                               $OUT .= loadTemplate('admin_edit_network_array_translation_row', true, $networkTranslationsData);
+                                               $OUT .= loadTemplate('admin_edit_network_array_translation_row', TRUE, $networkTranslationsData);
                                        } elseif (isFormSent('delete')) {
                                                // Get type data
                                                $networkTranslationsData['network_type_data'] = getNetworkTypeDataById($networkTranslationsData['network_type_id']);
 
                                                // Add row template for deleting
-                                               $OUT .= loadTemplate('admin_delete_network_array_translation_row', true, $networkTranslationsData);
+                                               $OUT .= loadTemplate('admin_delete_network_array_translation_row', TRUE, $networkTranslationsData);
                                        } else {
                                                // Problem!
                                                reportBug(__FUNCTION__, __LINE__, 'Cannot detect edit/delete.');
@@ -1799,35 +1807,38 @@ 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.');
                        }
 
                        // Don't display the list/add new form
-                       $GLOBALS['network_display'] = false;
+                       $GLOBALS['network_display'] = FALSE;
                } else {
                        // Nothing selected/found
-                       loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_REQUEST_PARAMETER_NOTHING_FOUND--}');
+                       loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_NETWORK_REQUEST_PARAMETER_NOTHING_FOUND--}');
                }
        } // END - if
 }
 
 // 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
@@ -1850,33 +1861,33 @@ function doAdminNetworkProcessNetworkApiConfig () {
                displayMessage('{--ADMIN_CONFIG_NETWORK_API_SAVED--}');
        } else {
                // Not added
-               loadTemplate('admin_settings_unsaved', false, '{--ADMIN_CONFIG_NETWORK_API_NOT_SAVED--}');
+               loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_CONFIG_NETWORK_API_NOT_SAVED--}');
        }
 }
 
 // Only adds network type configuration if not yet present
-function doAdminNetworkProcessAddHandlerTypesConfig ($displayMessage = true) {
-       // Remove the 'ok' part
-       unsetPostRequestElement('ok');
-
+function doAdminNetworkProcessAddHandlerTypesConfig ($displayMessage = TRUE) {
        // 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'))) {
@@ -1890,7 +1901,7 @@ function doAdminNetworkProcessAddHandlerTypesConfig ($displayMessage = true) {
        unsetPostRequestElement('set_all');
 
        // Shall we set for all?
-       if ($setAll === true) {
+       if ($setAll === TRUE) {
                // Get all handlers
                $result = SQL_QUERY_ESC('SELECT `network_type_id` FROM `{?_MYSQL_PREFIX?}_network_types` WHERE `network_id`=%s ORDER BY `network_type_id` ASC',
                        array(bigintval(getRequestElement('network_id'))), __FUNCTION__, __LINE__);
@@ -1911,7 +1922,7 @@ function doAdminNetworkProcessAddHandlerTypesConfig ($displayMessage = true) {
                        setGetRequestElement('network_type_id', $typeId);
 
                        // Call this function again
-                       $numRows += doAdminNetworkProcessAddHandlerTypesConfig(false);
+                       $numRows += doAdminNetworkProcessAddHandlerTypesConfig(FALSE);
                } // END - while
 
                // Free result
@@ -1923,7 +1934,7 @@ function doAdminNetworkProcessAddHandlerTypesConfig ($displayMessage = true) {
                        displayMessage('{%message,ADMIN_CONFIG_NETWORK_HANDLER_TYPE_ALL_HANDLER_SAVED=' . bigintval($numRows) . '%}');
                } else {
                        // Nothing has been saved
-                       loadTemplate('admin_settings_unsaved', false, '{--ADMIN_CONFIG_NETWORK_HANDLER_TYPE_HANDLER_NOT_CHANGED--}');
+                       loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_CONFIG_NETWORK_HANDLER_TYPE_HANDLER_NOT_CHANGED--}');
                }
        } else {
                // Get SQL query for new entry
@@ -1933,14 +1944,14 @@ function doAdminNetworkProcessAddHandlerTypesConfig ($displayMessage = true) {
                SQL_QUERY($SQL, __FUNCTION__, __LINE__);
 
                // Shall we display the message?
-               if ($displayMessage === true) {
+               if ($displayMessage === TRUE) {
                        // Output message
                        if (!SQL_HASZEROAFFECTED()) {
                                // Successfully added
                                displayMessage('{--ADMIN_CONFIG_NETWORK_HANDLER_TYPE_HANDLER_SAVED--}');
                        } else {
                                // Not added
-                               loadTemplate('admin_settings_unsaved', false, '{--ADMIN_CONFIG_NETWORK_HANDLER_TYPE_HANDLER_NOT_SAVED--}');
+                               loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_CONFIG_NETWORK_HANDLER_TYPE_HANDLER_NOT_SAVED--}');
                        }
                } else {
                        // Return amount of affected rows (1 or 2)
@@ -1950,9 +1961,9 @@ function doAdminNetworkProcessAddHandlerTypesConfig ($displayMessage = true) {
 }
 
 // Only changes network type configuration if not yet present
-function doAdminNetworkProcessEditHandlerTypesConfig ($displayMessage = true) {
-       // Remove the 'ok' part
-       unsetPostRequestElement('ok');
+function doAdminNetworkProcessEditHandlerTypesConfig ($displayMessage = TRUE) {
+       // Translate German comma to dot
+       convertCommaToDotInPostData('network_min_payment');
 
        /*
         * Some parameters are optional, at least one must be given so check a bunch
@@ -1960,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'))) {
@@ -1981,7 +1992,7 @@ function doAdminNetworkProcessEditHandlerTypesConfig ($displayMessage = true) {
        unsetPostRequestElement('set_all');
 
        // Shall we set for all?
-       if ($setAll === true) {
+       if ($setAll === TRUE) {
                // Get all data entries
                $result = SQL_QUERY_ESC('SELECT `network_data_id` FROM `{?_MYSQL_PREFIX?}_network_types_config` WHERE `network_id`=%s ORDER BY `network_type_id` ASC',
                        array(bigintval(getRequestElement('network_id'))), __FUNCTION__, __LINE__);
@@ -2002,7 +2013,7 @@ function doAdminNetworkProcessEditHandlerTypesConfig ($displayMessage = true) {
                        setPostRequestElement('network_data_id', $dataId);
 
                        // Call this function again
-                       $numRows += doAdminNetworkProcessEditHandlerTypesConfig(false);
+                       $numRows += doAdminNetworkProcessEditHandlerTypesConfig(FALSE);
                } // END - while
 
                // Free result
@@ -2014,7 +2025,7 @@ function doAdminNetworkProcessEditHandlerTypesConfig ($displayMessage = true) {
                        displayMessage('{%message,ADMIN_CONFIG_NETWORK_HANDLER_TYPE_ALL_HANDLER_SAVED=' . bigintval($numRows) . '%}');
                } else {
                        // Nothing has been saved
-                       loadTemplate('admin_settings_unsaved', false, '{--ADMIN_CONFIG_NETWORK_HANDLER_TYPE_HANDLER_NOT_CHANGED--}');
+                       loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_CONFIG_NETWORK_HANDLER_TYPE_HANDLER_NOT_CHANGED--}');
                }
        } else {
                // Get SQL query for new entry
@@ -2024,14 +2035,14 @@ function doAdminNetworkProcessEditHandlerTypesConfig ($displayMessage = true) {
                SQL_QUERY($SQL, __FUNCTION__, __LINE__);
 
                // Shall we display the message?
-               if ($displayMessage === true) {
+               if ($displayMessage === TRUE) {
                        // Output message
                        if (!SQL_HASZEROAFFECTED()) {
                                // Successfully added
                                displayMessage('{--ADMIN_CONFIG_NETWORK_HANDLER_TYPE_HANDLER_SAVED--}');
                        } else {
                                // Not added
-                               loadTemplate('admin_settings_unsaved', false, '{--ADMIN_CONFIG_NETWORK_HANDLER_TYPE_HANDLER_NOT_CHANGED--}');
+                               loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_CONFIG_NETWORK_HANDLER_TYPE_HANDLER_NOT_CHANGED--}');
                        }
                } else {
                        // Return amount of affected rows (1 or 2)
@@ -2102,10 +2113,10 @@ function doAdminNetworkProcessExport () {
        call_user_func($callbackName);
 
        // Mark it as called
-       $GLOBALS[__FUNCTION__][$callbackName] = true;
+       $GLOBALS[__FUNCTION__][$callbackName] = TRUE;
 
        // Don't display the list/add new form
-       $GLOBALS['network_display'] = false;
+       $GLOBALS['network_display'] = FALSE;
 }
 
 // Exports (and displays) the table 'network_data'
@@ -2154,7 +2165,7 @@ ORDER BY
        SQL_FREERESULT($result);
 
        // Output the SQL query
-       loadTemplate('admin_export_network_data', false, $SQL);
+       loadTemplate('admin_export_network_data', FALSE, $SQL);
 }
 
 // Exports (and displays) the table 'network_types'
@@ -2218,7 +2229,7 @@ ORDER BY
        SQL_FREERESULT($result);
 
        // Output the SQL query
-       loadTemplate('admin_export_network_types', false, $SQL);
+       loadTemplate('admin_export_network_types', FALSE, $SQL);
 }
 
 // Exports (and displays) the table 'network_request_params'
@@ -2276,7 +2287,7 @@ ORDER BY
        SQL_FREERESULT($result);
 
        // Output the SQL query
-       loadTemplate('admin_export_network_request_params', false, $SQL);
+       loadTemplate('admin_export_network_request_params', FALSE, $SQL);
 }
 
 // Exports (and displays) the table 'network_vcheck_params'
@@ -2331,7 +2342,7 @@ ORDER BY
        SQL_FREERESULT($result);
 
        // Output the SQL query
-       loadTemplate('admin_export_network_vcheck_params', false, $SQL);
+       loadTemplate('admin_export_network_vcheck_params', FALSE, $SQL);
 }
 
 // Exports (and displays) the table 'network_array_translation'
@@ -2379,7 +2390,7 @@ ORDER BY
        SQL_FREERESULT($result);
 
        // Output the SQL query
-       loadTemplate('admin_export_network_array_translation', false, $SQL);
+       loadTemplate('admin_export_network_array_translation', FALSE, $SQL);
 }
 
 // [EOF]