Typos fixed + keep fake modules hidden

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

diff --git a/inc/libs/network_functions.php b/inc/libs/network_functions.php
index a5cec2ca0043d04386fa69cc9776dd77729bf774..e90c66c73ca107fca3d58cb4e884ebad2588af44 100644 (file)
--- a/inc/libs/network_functions.php
+++ b/inc/libs/network_functions.php
@@ -206,7 +206,7 @@ function isNetworkRequestElementValid ($key, $networkTypeId, $networkId) {
        // Is there cache?
        if (!isset($GLOBALS[__FUNCTION__][$networkId][$networkTypeId][$key])) {
                // Does it exist?
-               $GLOBALS[__FUNCTION__][$networkId][$networkTypeId][$key] = (countSumTotalData(bigintval($networkId), 'network_request_params', 'network_id', 'network_request_param_id', 'network_id', TRUE, sprintf(" AND `network_type_id`=%s AND `network_request_param_key`='%s'", bigintval($networkTypeId), SQL_ESCAPE($key))) == 1);
+               $GLOBALS[__FUNCTION__][$networkId][$networkTypeId][$key] = (countSumTotalData(bigintval($networkId), 'network_request_params', 'network_request_param_id', 'network_id', TRUE, sprintf(" AND `network_type_id`=%s AND `network_request_param_key`='%s'", bigintval($networkTypeId), SQL_ESCAPE($key))) == 1);
        } // END - if
 
        // Return result
@@ -677,7 +677,8 @@ ORDER BY
                                if (((($includeConfigured === FALSE) && (isNetworkApiConfigured($row['network_id']))) || (($includeUnconfigured === FALSE) && (!isNetworkApiConfigured($row['network_id'])))) && ($separated === FALSE)) {
                                        // Skip this entry
                                        continue;
-                               } elseif ((!empty($addSql)) && (
+                               // @TODO Unfinished: } elseif ((!empty($addSql)) && (
+                               } // END - if
 
                                // Add entry
                                $rows[$row['network_id']] = $row;
@@ -712,7 +713,7 @@ ORDER BY
                }
        } else {
                // Nothing selected
-               $content = loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_ENTRIES_404--}');
+               $content = displayErrorMessage('{--ADMIN_ENTRIES_404--}');
        }
 
        // Free the result
@@ -758,7 +759,7 @@ ORDER BY
                $content = generateSelectionBoxFromArray($rows, 'network_type', 'network_type_id');
        } else {
                // Nothing selected
-               $content = loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_ENTRIES_404--}');
+               $content = displayErrorMessage('{--ADMIN_ENTRIES_404--}');
        }
 
        // Free the result
@@ -805,7 +806,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 = displayErrorMessage('{--ADMIN_ENTRIES_404--}');
        }
 
        // Free the result
@@ -1818,7 +1819,7 @@ 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') . '%}');
+               displayErrorMessage('{%message,ADMIN_NETWORK_ALREADY_ADDED=' . postRequestElement('network_short_name') . '%}');
                return FALSE;
        } // END - if
 
@@ -1834,7 +1835,7 @@ function doAdminNetworkProcessAddNetwork () {
                loadTemplate('admin_network_added', FALSE, postRequestArray());
        } else {
                // Not added
-               loadTemplate('admin_settings_unsaved', FALSE, '{%message,ADMIN_NETWORK_DATA_NOT_ADDED=' . postRequestElement('network_short_name') . '%}');
+               displayErrorMessage('{%message,ADMIN_NETWORK_DATA_NOT_ADDED=' . postRequestElement('network_short_name') . '%}');
        }
 }
 
@@ -1858,7 +1859,7 @@ function doAdminNetworkProcessHandleNetworks () {
                        } // END - if
                } // END - foreach
 
-               // If we have no rows, we don't need to display the edit form
+               // If there are no rows, we don't need to display the edit form
                if (!empty($OUT)) {
                        // Init array with generic element
                        $content = array(
@@ -1872,7 +1873,7 @@ function doAdminNetworkProcessHandleNetworks () {
                        $GLOBALS['network_display'] = FALSE;
                } else {
                        // Nothing selected/found
-                       loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_NETWORK_NOTHING_FOUND--}');
+                       displayErrorMessage('{--ADMIN_NETWORK_NOTHING_FOUND--}');
                }
        } // END - if
 }
@@ -1908,7 +1909,7 @@ function doAdminNetworkProcessHandleNetworkTypes () {
                        } // END - if
                } // END - foreach
 
-               // If we have no rows, we don't need to display the edit form
+               // If there are no rows, we don't need to display the edit form
                if (!empty($OUT)) {
                        // Prepare array with generic elements
                        $content = array(
@@ -1930,7 +1931,7 @@ function doAdminNetworkProcessHandleNetworkTypes () {
                        $GLOBALS['network_display'] = FALSE;
                } else {
                        // Nothing selected/found
-                       loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_NETWORK_TYPE_HANDLER_NOTHING_FOUND--}');
+                       displayErrorMessage('{--ADMIN_NETWORK_TYPE_HANDLER_NOTHING_FOUND--}');
                }
        } // END - if
 }
@@ -1972,7 +1973,7 @@ function doAdminNetworkProcessHandleRequestParams () {
                        } // END - if
                } // END - foreach
 
-               // If we have no rows, we don't need to display the edit form
+               // If there are no rows, we don't need to display the edit form
                if (!empty($OUT)) {
                        // Prepare array with generic elements
                        $content = array(
@@ -1994,7 +1995,7 @@ function doAdminNetworkProcessHandleRequestParams () {
                        $GLOBALS['network_display'] = FALSE;
                } else {
                        // Nothing selected/found
-                       loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_NETWORK_REQUEST_PARAMETER_NOTHING_FOUND--}');
+                       displayErrorMessage('{--ADMIN_NETWORK_REQUEST_PARAMETER_NOTHING_FOUND--}');
                }
        } // END - if
 }
@@ -2041,7 +2042,7 @@ function doAdminNetworkProcessChangeNetworks () {
                        displayMessage('{%message,ADMIN_NETWORK_UPDATED=' . $updated . '%}');
                } else {
                        // Nothing changed
-                       loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_NETWORK_NOTHING_CHANGED--}');
+                       displayErrorMessage('{--ADMIN_NETWORK_NOTHING_CHANGED--}');
                }
        } // END - if
 }
@@ -2068,7 +2069,7 @@ function doAdminNetworkProcessRemoveNetworks () {
                        displayMessage('{%message,ADMIN_NETWORK_REMOVED=' . $removed . '%}');
                } else {
                        // Nothing removed
-                       loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_NETWORK_NOTHING_REMOVED--}');
+                       displayErrorMessage('{--ADMIN_NETWORK_NOTHING_REMOVED--}');
                }
        } // END - if
 }
@@ -2078,7 +2079,7 @@ 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') . '%}');
+               displayErrorMessage('{%message,ADMIN_NETWORK_TYPE_HANDLER_ALREADY_ADDED=' . postRequestElement('network_type_handler') . '%}');
 
                // ... so abort here
                return FALSE;
@@ -2108,7 +2109,7 @@ function doAdminNetworkProcessAddNetworkType () {
                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') . '%}');
+               displayErrorMessage('{%message,ADMIN_NETWORK_TYPE_HANDLER_NOT_ADDED=' . postRequestElement('network_type_handler') . '%}');
        }
 }
 
@@ -2160,7 +2161,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--}');
+                       displayErrorMessage('{--ADMIN_NETWORK_TYPE_HANDLER_NOTHING_CHANGED--}');
                }
        } // END - if
 }
@@ -2213,7 +2214,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--}');
+                       displayErrorMessage('{--ADMIN_NETWORK_REQUEST_PARAMETER_NOTHING_CHANGED--}');
                }
        } // END - if
 }
@@ -2266,7 +2267,7 @@ function doAdminNetworkProcessChangeArrayTranslation () {
                        displayMessage('{%message,ADMIN_NETWORK_ARRAY_TRANSLATION_UPDATED=' . $updated . '%}');
                } else {
                        // Nothing changed
-                       loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_NETWORK_ARRAY_TRANSLATION_NOTHING_CHANGED--}');
+                       displayErrorMessage('{--ADMIN_NETWORK_ARRAY_TRANSLATION_NOTHING_CHANGED--}');
                }
        } // END - if
 }
@@ -2293,7 +2294,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--}');
+                       displayErrorMessage('{--ADMIN_NETWORK_TYPE_HANDLER_NOTHING_REMOVED--}');
                }
        } // END - if
 }
@@ -2320,7 +2321,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--}');
+                       displayErrorMessage('{--ADMIN_NETWORK_REQUEST_PARAMETER_NOTHING_REMOVED--}');
                }
        } // END - if
 }
@@ -2347,7 +2348,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--}');
+                       displayErrorMessage('{--ADMIN_NETWORK_ARRAY_TRANSLATION_NOTHING_REMOVED--}');
                }
        } // END - if
 }
@@ -2357,7 +2358,7 @@ 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') . '%}');
+               displayErrorMessage('{%message,ADMIN_NETWORK_REQUEST_PARAMETER_ALREADY_ADDED=' . postRequestElement('network_request_param_key') . '%}');
 
                // ... so abort here
                return FALSE;
@@ -2381,7 +2382,7 @@ function doAdminNetworkProcessAddRequestParam () {
                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') . '%}');
+               displayErrorMessage('{%message,ADMIN_NETWORK_REQUEST_PARAMETER_NOT_ADDED=' . postRequestElement('network_request_param_key') . '%}');
        }
 }
 
@@ -2390,7 +2391,7 @@ 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') . '%}');
+               displayErrorMessage('{%message,ADMIN_NETWORK_ARRAY_TRANSLATION_ALREADY_ADDED=' . postRequestElement('network_array_index') . '%}');
 
                // ... so abort here
                return FALSE;
@@ -2418,7 +2419,7 @@ function doAdminNetworkProcessAddNetworkArrayTranslation () {
                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') . '%}');
+               displayErrorMessage('{%message,ADMIN_NETWORK_ARRAY_TRANSLATION_NOT_ADDED=' . postRequestElement('network_array_index') . '%}');
        }
 }
 
@@ -2459,7 +2460,7 @@ function doAdminNetworkProcessHandleArrayTranslations () {
                        } // END - if
                } // END - foreach
 
-               // If we have no rows, we don't need to display the edit form
+               // If there are no rows, we don't need to display the edit form
                if (!empty($OUT)) {
                        // Prepare array with generic elements
                        $content = array(
@@ -2481,7 +2482,7 @@ function doAdminNetworkProcessHandleArrayTranslations () {
                        $GLOBALS['network_display'] = FALSE;
                } else {
                        // Nothing selected/found
-                       loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_NETWORK_REQUEST_PARAMETER_NOTHING_FOUND--}');
+                       displayErrorMessage('{--ADMIN_NETWORK_REQUEST_PARAMETER_NOTHING_FOUND--}');
                }
        } // END - if
 }
@@ -2492,7 +2493,7 @@ function doAdminNetworkProcessNetworkApiConfig () {
        setPostRequestElement('network_id', bigintval(getRequestElement('network_id')));
 
        // NULL empty values
-       foreach (array('network_api_referral_button', 'network_api_visual_pay_check') as $key) {
+       foreach (array('network_api_site_id', 'network_api_referral_button', 'network_api_visual_pay_check') as $key) {
                // Is it set?
                if (!isPostRequestElementSet($key)) {
                        // Remove empty value to get a NULL for an optional entry
@@ -2518,7 +2519,7 @@ function doAdminNetworkProcessNetworkApiConfig () {
                displayMessage('{--ADMIN_CONFIG_NETWORK_API_SAVED--}');
        } else {
                // Not added
-               loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_CONFIG_NETWORK_API_NOT_SAVED--}');
+               displayErrorMessage('{--ADMIN_CONFIG_NETWORK_API_NOT_SAVED--}');
        }
 }
 
@@ -2596,7 +2597,7 @@ function doAdminNetworkProcessAddHandlerTypesConfig ($displayMessage = TRUE, $co
                        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--}');
+                       displayErrorMessage('{--ADMIN_CONFIG_NETWORK_HANDLER_TYPE_HANDLER_NOT_CHANGED--}');
                }
        } else {
                // Get SQL query for new entry
@@ -2613,7 +2614,7 @@ function doAdminNetworkProcessAddHandlerTypesConfig ($displayMessage = TRUE, $co
                                displayMessage('{--ADMIN_CONFIG_NETWORK_HANDLER_TYPE_HANDLER_SAVED--}');
                        } else {
                                // Not added
-                               loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_CONFIG_NETWORK_HANDLER_TYPE_HANDLER_NOT_SAVED--}');
+                               displayErrorMessage('{--ADMIN_CONFIG_NETWORK_HANDLER_TYPE_HANDLER_NOT_SAVED--}');
                        }
                } else {
                        // Return amount of affected rows (1 or 2)
@@ -2692,7 +2693,7 @@ function doAdminNetworkProcessEditHandlerTypesConfig ($displayMessage = TRUE, $c
                        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--}');
+                       displayErrorMessage('{--ADMIN_CONFIG_NETWORK_HANDLER_TYPE_HANDLER_NOT_CHANGED--}');
                }
        } else {
                // Get SQL query for new entry
@@ -2709,7 +2710,7 @@ function doAdminNetworkProcessEditHandlerTypesConfig ($displayMessage = TRUE, $c
                                displayMessage('{--ADMIN_CONFIG_NETWORK_HANDLER_TYPE_HANDLER_SAVED--}');
                        } else {
                                // Not added
-                               loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_CONFIG_NETWORK_HANDLER_TYPE_HANDLER_NOT_CHANGED--}');
+                               displayErrorMessage('{--ADMIN_CONFIG_NETWORK_HANDLER_TYPE_HANDLER_NOT_CHANGED--}');
                        }
                } else {
                        // Return amount of affected rows (1 or 2)