Extension ext-earning introduced (unfinished), renamings:

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

diff --git a/inc/libs/network_functions.php b/inc/libs/network_functions.php
index 7dac613834936803a1765b582924cc1427b2f815..0717d47b2c9f292a1ece81b921d7f83f0904f5e4 100644 (file)
--- a/inc/libs/network_functions.php
+++ b/inc/libs/network_functions.php
@@ -55,7 +55,7 @@ function doNetworkHandleForm () {
        // Was the form sent?
        if ((isFormSent()) || (isFormSent('edit')) || (isFormSent('delete')) || (isFormSent('do_edit')) || (isFormSent('do_delete'))) {
                // Do we have a 'do'?
-               if (isGetRequestParameterSet('do')) {
+               if (isGetRequestElementSet('do')) {
                        // Process the request
                        doAdminNetworkProcessForm();
                } else {
@@ -72,19 +72,19 @@ function doAdminNetworkProcessForm () {
                // Abort here
                loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_FORM_NOT_SENT--}');
                return;
-       } elseif (!isGetRequestParameterSet('do')) {
+       } elseif (!isGetRequestElementSet('do')) {
                // No 'do' found
                loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_DO_404--}');
                return;
        }
 
        // Create function name
-       $functionName = sprintf("doAdminNetworkProcess%s", capitalizeUnderscoreString(getRequestParameter('do')));
+       $functionName = sprintf("doAdminNetworkProcess%s", capitalizeUnderscoreString(getRequestElement('do')));
 
        // Is the function valid?
        if (!function_exists($functionName)) {
                // Invalid function name
-               debug_report_bug(__FUNCTION__, __LINE__, 'Invalid do ' . getRequestParameter('do') . ', function ' . $functionName .' does not exist.', false);
+               debug_report_bug(__FUNCTION__, __LINE__, 'Invalid do ' . getRequestElement('do') . ', function ' . $functionName .' does not exist.', false);
        } // END - if
 
        // Call-back the method handling our request
@@ -124,7 +124,7 @@ function isNetworkTypeHandleValid ($type, $networkId) {
 }
 
 // Checks wether the given network request parameter is already used (valid)
-function isNetworkRequestParameterValid ($key, $type, $networkId) {
+function isNetworkRequestElementValid ($key, $type, $networkId) {
        // Query for it
        $result = SQL_QUERY_ESC("SELECT `network_param_id` FROM `{?_MYSQL_PREFIX?}_network_request_params` WHERE `network_id`=%s AND `network_type_id`=%s AND `request_param_key`='%s' LIMIT 1",
                array($networkId, $type, $key), __FUNCTION__, __LINE__);
@@ -512,7 +512,7 @@ function generateNetworkTypeOptions ($id) {
                        '',
                        sprintf(
                                "WHERE `network_id`=%s",
-                               bigintval(getRequestParameter('network'))
+                               bigintval(getRequestElement('network'))
                        ),
                        '',
                        'translateNetworkTypeHandler'
@@ -601,7 +601,7 @@ function generateNetworkRequestKeyOptions () {
                        '',
                        '', '',
                        $GLOBALS['network_params_disabled'],
-                       'translateNetworkRequestParameter'
+                       'translateNetworkRequestElement'
                );
        } // END - if
 
@@ -684,7 +684,7 @@ function translateNetworkRequestType ($type) {
 }
 
 // Translates request parameter
-function translateNetworkRequestParameter ($param) {
+function translateNetworkRequestElement ($param) {
        // Get the message id
        return '{--ADMIN_NETWORK_REQUEST_PARAMETER_' . strtoupper($param) . '--}';
 }
@@ -741,14 +741,14 @@ ORDER BY
 // Callback function to add new network
 function doAdminNetworkProcessAddNetwork () {
        // We can say here, the form is sent, so check if the network is already added
-       if (isNetworkNameValid(postRequestParameter('network_short_name'))) {
+       if (isNetworkNameValid(postRequestElement('network_short_name'))) {
                // Already there
-               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_ALREADY_ADDED=' . postRequestParameter('network_short_name') . '%}');
+               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_ALREADY_ADDED=' . postRequestElement('network_short_name') . '%}');
                return false;
        } // END - if
 
        // Remove the 'ok' part
-       unsetPostRequestParameter('ok');
+       unsetPostRequestElement('ok');
 
        // Add the whole request to database
        SQL_QUERY('INSERT INTO
@@ -760,7 +760,7 @@ function doAdminNetworkProcessAddNetwork () {
 )", __FUNCTION__, __LINE__);
 
        // Add the id for output only
-       setPostRequestParameter('network_id', SQL_INSERTID());
+       setPostRequestElement('network_id', SQL_INSERTID());
 
        // Output message
        if (!SQL_HASZEROAFFECTED()) {
@@ -768,7 +768,7 @@ function doAdminNetworkProcessAddNetwork () {
                loadTemplate('admin_network_added', false, postRequestArray());
        } else {
                // Not added
-               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_DATA_NOT_ADDED=' . postRequestParameter('network_short_name') . '%}');
+               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_DATA_NOT_ADDED=' . postRequestElement('network_short_name') . '%}');
        }
 }
 
@@ -778,7 +778,7 @@ function doAdminNetworkProcessHandleNetwork () {
        if (ifPostContainsSelections()) {
                // Something has been selected, so start displaying one by one
                $OUT = '';
-               foreach (postRequestParameter('sel') as $id => $sel) {
+               foreach (postRequestElement('sel') as $id => $sel) {
                        // Is this selected?
                        if ($sel == 1) {
                                // Load this network's data
@@ -826,11 +826,11 @@ function doAdminNetworkProcessHandleNetworkType () {
        // Do we have selections?
        if (ifPostContainsSelections()) {
                // Load network data
-               $networkData = getNetworkDataById(getRequestParameter('network'));
+               $networkData = getNetworkDataById(getRequestElement('network'));
 
                // Something has been selected, so start displaying one by one
                $OUT = '';
-               foreach (postRequestParameter('sel') as $id => $sel) {
+               foreach (postRequestElement('sel') as $id => $sel) {
                        // Is this selected?
                        if ($sel == 1) {
                                // Load this network's data
@@ -881,11 +881,11 @@ function doAdminNetworkProcessHandleRequestParams () {
                $GLOBALS['network_params_disabled'] = array();
 
                // Load network data
-               $networkData = getNetworkDataById(getRequestParameter('network'));
+               $networkData = getNetworkDataById(getRequestElement('network'));
 
                // Something has been selected, so start displaying one by one
                $OUT = '';
-               foreach (postRequestParameter('sel') as $id => $sel) {
+               foreach (postRequestElement('sel') as $id => $sel) {
                        // Is this selected?
                        if ($sel == 1) {
                                // Load this network's data
@@ -939,7 +939,7 @@ function doAdminNetworkProcessChangeNetwork () {
                $updated = 0;
 
                // Something has been selected, so start updating them
-               foreach (postRequestParameter('sel') as $id => $sel) {
+               foreach (postRequestElement('sel') as $id => $sel) {
                        // Update this entry?
                        if ($sel == 1) {
                                // Init data array
@@ -984,7 +984,7 @@ function doAdminNetworkProcessRemoveNetwork () {
                $removed = 0;
 
                // Something has been selected, so start updating them
-               foreach (postRequestParameter('sel') as $id => $sel) {
+               foreach (postRequestElement('sel') as $id => $sel) {
                        // Update this entry?
                        if ($sel == 1) {
                                // Remove this entry
@@ -1006,24 +1006,24 @@ function doAdminNetworkProcessRemoveNetwork () {
 // Add a network type handler if not yet found
 function doAdminNetworkProcessAddNetworkType () {
        // Is the network type handle already used with given network?
-       if (isNetworkTypeHandleValid(postRequestParameter('network_type_handle'), getRequestParameter('network'))) {
+       if (isNetworkTypeHandleValid(postRequestElement('network_type_handle'), getRequestElement('network'))) {
                // Already added
-               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_TYPES_HANDLE_ALREADY_ADDED=' . postRequestParameter('network_type_handle') . '%}');
+               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_TYPES_HANDLE_ALREADY_ADDED=' . postRequestElement('network_type_handle') . '%}');
 
                // ... so abort here
                return false;
        } // END - if
 
        // Remove the 'ok' part
-       unsetPostRequestParameter('ok');
+       unsetPostRequestElement('ok');
 
        // Add id
-       setPostRequestParameter('network_id', bigintval(getRequestParameter('network')));
+       setPostRequestElement('network_id', bigintval(getRequestElement('network')));
 
        // Is network_type_banner_url set?
-       if (postRequestParameter('network_type_banner_url') == '') {
+       if (postRequestElement('network_type_banner_url') == '') {
                // Remove empty value to get a NULL for an optional entry
-               unsetPostRequestParameter('network_type_banner_url');
+               unsetPostRequestElement('network_type_banner_url');
        } // END - if
 
        // Add the whole request to database
@@ -1041,7 +1041,7 @@ function doAdminNetworkProcessAddNetworkType () {
                loadTemplate('admin_network_type_added', false, postRequestArray());
        } else {
                // Not added
-               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_TYPES_NOT_ADDED=' . postRequestParameter('network_type_handle') . '%}');
+               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_TYPES_NOT_ADDED=' . postRequestElement('network_type_handle') . '%}');
        }
 }
 
@@ -1053,7 +1053,7 @@ function doAdminNetworkProcessChangeNetworkType () {
                $updated = 0;
 
                // Something has been selected, so start updating them
-               foreach (postRequestParameter('sel') as $id => $sel) {
+               foreach (postRequestElement('sel') as $id => $sel) {
                        // Update this entry?
                        if ($sel == 1) {
                                // Init data array
@@ -1104,7 +1104,7 @@ function doAdminNetworkProcessChangeNetworkParam () {
                $updated = 0;
 
                // Something has been selected, so start updating them
-               foreach (postRequestParameter('sel') as $id => $sel) {
+               foreach (postRequestElement('sel') as $id => $sel) {
                        // Update this entry?
                        if ($sel == 1) {
                                // Init data array
@@ -1155,7 +1155,7 @@ function doAdminNetworkProcessRemoveNetworkType () {
                $removed = 0;
 
                // Something has been selected, so start updating them
-               foreach (postRequestParameter('sel') as $id => $sel) {
+               foreach (postRequestElement('sel') as $id => $sel) {
                        // Update this entry?
                        if ($sel == 1) {
                                // Remove this entry
@@ -1182,7 +1182,7 @@ function doAdminNetworkProcessRemoveNetworkParam () {
                $removed = 0;
 
                // Something has been selected, so start updating them
-               foreach (postRequestParameter('sel') as $id => $sel) {
+               foreach (postRequestElement('sel') as $id => $sel) {
                        // Update this entry?
                        if ($sel == 1) {
                                // Remove this entry
@@ -1204,24 +1204,24 @@ function doAdminNetworkProcessRemoveNetworkParam () {
 // Adds a request parameter to given network and type
 function doAdminNetworkProcessAddNetworkParam () {
        // Is the request parameter already used with given network?
-       if (isNetworkRequestParameterValid(postRequestParameter('request_param_key'), postRequestParameter('network_type_id'), getRequestParameter('network'))) {
+       if (isNetworkRequestElementValid(postRequestElement('request_param_key'), postRequestElement('network_type_id'), getRequestElement('network'))) {
                // Already added
-               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_REQUEST_PARAMETER_ALREADY_ADDED=' . postRequestParameter('request_param_key') . '%}');
+               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_REQUEST_PARAMETER_ALREADY_ADDED=' . postRequestElement('request_param_key') . '%}');
 
                // ... so abort here
                return false;
        } // END - if
 
        // Remove the 'ok' part
-       unsetPostRequestParameter('ok');
+       unsetPostRequestElement('ok');
 
        // Add id
-       setPostRequestParameter('network_id', bigintval(getRequestParameter('network')));
+       setPostRequestElement('network_id', bigintval(getRequestElement('network')));
 
        // Is request_param_default set?
-       if (postRequestParameter('request_param_default') == '') {
+       if (postRequestElement('request_param_default') == '') {
                // Remove empty value to get a NULL for an optional entry
-               unsetPostRequestParameter('request_param_default');
+               unsetPostRequestElement('request_param_default');
        } // END - if
 
        // Add the whole request to database
@@ -1239,35 +1239,35 @@ function doAdminNetworkProcessAddNetworkParam () {
                loadTemplate('admin_network_request_param_added', false, postRequestArray());
        } else {
                // Not added
-               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_REQUEST_PARAMETER_NOT_ADDED=' . postRequestParameter('request_param_key') . '%}');
+               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_REQUEST_PARAMETER_NOT_ADDED=' . postRequestElement('request_param_key') . '%}');
        }
 }
 
 // Adds a API response array entry
 function doAdminNetworkProcessAddNetworkApiTranslation () {
        // Is the request parameter already used with given network?
-       if (isNetworkApiTranslationValid(postRequestParameter('network_api_index'), postRequestParameter('network_type_id'), getRequestParameter('network'))) {
+       if (isNetworkApiTranslationValid(postRequestElement('network_api_index'), postRequestElement('network_type_id'), getRequestElement('network'))) {
                // Already added
-               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_API_TRANSLATION_ALREADY_ADDED=' . postRequestParameter('network_api_index') . '%}');
+               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_API_TRANSLATION_ALREADY_ADDED=' . postRequestElement('network_api_index') . '%}');
 
                // ... so abort here
                return false;
        } // END - if
 
        // Remove the 'ok' part
-       unsetPostRequestParameter('ok');
+       unsetPostRequestElement('ok');
 
        // Add id
-       setPostRequestParameter('network_id', bigintval(getRequestParameter('network')));
+       setPostRequestElement('network_id', bigintval(getRequestElement('network')));
 
        // Add sorting
-       setPostRequestParameter('sort', (countSumTotalData(
-               postRequestParameter('network_id'),
+       setPostRequestElement('sort', (countSumTotalData(
+               postRequestElement('network_id'),
                'network_api_translation',
                'network_api_id',
                'network_id',
                true,
-               sprintf(" AND `network_type_id`=%s", bigintval(postRequestParameter('network_type_id')))
+               sprintf(" AND `network_type_id`=%s", bigintval(postRequestElement('network_type_id')))
        ) + 1));
 
        // Add the whole request to database
@@ -1285,7 +1285,7 @@ function doAdminNetworkProcessAddNetworkApiTranslation () {
                loadTemplate('admin_network_api_translation_added', false, postRequestArray());
        } else {
                // Not added
-               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_API_TRANSLATION_NOT_ADDED=' . postRequestParameter('network_api_index') . '%}');
+               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_API_TRANSLATION_NOT_ADDED=' . postRequestElement('network_api_index') . '%}');
        }
 }