Extension ext-network continued:

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

diff --git a/inc/libs/network_functions.php b/inc/libs/network_functions.php
index 449e5c3b5b1acf86fb87bb7e8ef2a8cf67f52845..5794a6f219fcbbf09bae3aabd88ec92d06ee385e 100644 (file)
--- a/inc/libs/network_functions.php
+++ b/inc/libs/network_functions.php
@@ -129,7 +129,7 @@ function isNetworkNameValid ($name) {
 // Checks wether the given network type is already used (valid)
 function isNetworkTypeHandleValid ($type, $networkId) {
        // Query for it
-       $result = SQL_QUERY_ESC("SELECT `network_type_id` FROM `{?_MYSQL_PREFIX?}_network_types` WHERE `network_id`=%s AND `network_type_handle`='%s' LIMIT 1",
+       $result = SQL_QUERY_ESC("SELECT `network_type_id` FROM `{?_MYSQL_PREFIX?}_network_types` WHERE `network_id`=%s AND `network_type_handler`='%s' LIMIT 1",
                array(
                        $networkId,
                        $type
@@ -268,7 +268,7 @@ function getNetworkDataByTypeId ($networkId, $column = '') {
        d.`network_charset`,
        d.`network_require_id_card`,
        d.`network_query_amount`,
-       t.`network_type_handle`,
+       t.`network_type_handler`,
        t.`network_type_api_url`,
        t.`network_type_click_url`,
        t.`network_type_banner_url`
@@ -318,7 +318,7 @@ function getNetworkTypeDataById ($networkId) {
        $result = SQL_QUERY_ESC('SELECT
        `network_type_id`,
        `network_id`,
-       `network_type_handle`,
+       `network_type_handler`,
        `network_type_api_url`,
        `network_type_click_url`,
        `network_type_banner_url`
@@ -481,13 +481,13 @@ function generateAdminNetworkTypeList ($networkId) {
        // Query all types of this network
        $result = SQL_QUERY_ESC('SELECT
        `network_type_id`,
-       `network_type_handle`
+       `network_type_handler`
 FROM
        `{?_MYSQL_PREFIX?}_network_types`
 WHERE
        `network_id`=%s
 ORDER BY
-       `network_type_handle` ASC',
+       `network_type_handler` ASC',
                array(
                        bigintval($networkId)
                ), __FUNCTION__, __LINE__);
@@ -525,7 +525,7 @@ function generateAdminDistinctNetworkTypeList () {
 
        // Query all types of this network
        $result = SQL_QUERY('SELECT
-       t.`network_type_id`, t.`network_type_handle`, d.`network_title`
+       t.`network_type_id`, t.`network_type_handler`, d.`network_title`
 FROM
        `{?_MYSQL_PREFIX?}_network_types` AS t
 LEFT JOIN
@@ -534,7 +534,7 @@ ON
        t.`network_id`=d.`network_id`
 ORDER BY
        d.`network_short_name` ASC,
-       t.`network_type_handle` ASC', __FUNCTION__, __LINE__);
+       t.`network_type_handler` ASC', __FUNCTION__, __LINE__);
 
        // Do we have entries?
        if (!SQL_HASZERONUMS($result)) {
@@ -576,7 +576,7 @@ function generateNetworkTypeOptions ($networkId) {
                $GLOBALS[__FUNCTION__][$networkId] = generateOptionList(
                        'network_types',
                        'network_type_id',
-                       'network_type_handle',
+                       'network_type_handler',
                        $networkId,
                        '',
                        sprintf(
@@ -669,8 +669,8 @@ function generateNetworkRequestKeyOptions () {
                        array(),
                        '',
                        '', '',
-                       $GLOBALS['network_params_disabled'],
-                       'translateNetworkRequestElement'
+                       $GLOBALS['network_request_params_disabled'],
+                       'translateNetworkRequestParamKey'
                );
        } // END - if
 
@@ -743,7 +743,7 @@ function translateNetworkTranslationName ($name) {
 // Translates the network type handler (e.g. banner, paidmail) for templates
 function translateNetworkTypeHandler ($type) {
        // Get the message id
-       return '{--ADMIN_NETWORK_TYPES_' . strtoupper($type) . '--}';
+       return '{--ADMIN_NETWORK_HANDLER_TYPES_' . strtoupper($type) . '--}';
 }
 
 // Translates request type
@@ -753,7 +753,7 @@ function translateNetworkRequestType ($type) {
 }
 
 // Translates request parameter
-function translateNetworkRequestElement ($param) {
+function translateNetworkRequestParamKey ($param) {
        // Get the message id
        return '{--ADMIN_NETWORK_REQUEST_PARAMETER_' . strtoupper($param) . '--}';
 }
@@ -893,7 +893,7 @@ function doAdminNetworkProcessAddNetwork () {
 }
 
 // Displays selected networks for editing
-function doAdminNetworkProcessHandleNetwork () {
+function doAdminNetworkProcessHandleNetworks () {
        // Do we have selections?
        if (ifPostContainsSelections()) {
                // Something has been selected, so start displaying one by one
@@ -927,7 +927,7 @@ function doAdminNetworkProcessHandleNetwork () {
 }
 
 // Handle network type form
-function doAdminNetworkProcessHandleNetworkType () {
+function doAdminNetworkProcessHandleNetworkTypes () {
        // Do we have selections?
        if (ifPostContainsSelections()) {
                // Load network data
@@ -973,7 +973,7 @@ function doAdminNetworkProcessHandleNetworkType () {
                        $GLOBALS['network_display'] = false;
                } else {
                        // Nothing selected/found
-                       loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_TYPES_NOTHING_FOUND--}');
+                       loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_HANDLER_TYPES_NOTHING_FOUND--}');
                }
        } // END - if
 }
@@ -983,7 +983,7 @@ function doAdminNetworkProcessHandleRequestParams () {
        // Do we have selections?
        if (ifPostContainsSelections()) {
                // Init cache array
-               $GLOBALS['network_params_disabled'] = array();
+               $GLOBALS['network_request_params_disabled'] = array();
 
                // Load network data
                $networkData = getNetworkDataById(getRequestElement('network_id'));
@@ -1000,13 +1000,13 @@ function doAdminNetworkProcessHandleRequestParams () {
                                if (count($networkRequestData) > 0) {
                                        if (isFormSent('edit')) {
                                                // Add row template for deleting
-                                               $OUT .= loadTemplate('admin_edit_network_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_params_row', true, $networkRequestData);
+                                               $OUT .= loadTemplate('admin_delete_network_request_params_row', true, $networkRequestData);
                                        } else {
                                                // Problem!
                                                debug_report_bug(__FUNCTION__, __LINE__, 'Cannot detect edit/del.');
@@ -1019,9 +1019,9 @@ function doAdminNetworkProcessHandleRequestParams () {
                if (!empty($OUT)) {
                        // Output main template
                        if (isFormSent('edit')) {
-                               loadTemplate('admin_edit_network_params', false, $OUT);
+                               loadTemplate('admin_edit_network_request_params', false, $OUT);
                        } elseif (isFormSent('delete')) {
-                               loadTemplate('admin_delete_network_params', false, $OUT);
+                               loadTemplate('admin_delete_network_request_params', false, $OUT);
                        } else {
                                // Problem!
                                debug_report_bug(__FUNCTION__, __LINE__, 'Cannot detect edit/del.');
@@ -1037,7 +1037,7 @@ function doAdminNetworkProcessHandleRequestParams () {
 }
 
 // Changes given networks
-function doAdminNetworkProcessChangeNetwork () {
+function doAdminNetworkProcessChangeNetworks () {
        // Do we have selections?
        if (ifPostContainsSelections()) {
                // By default nothing is updated
@@ -1084,7 +1084,7 @@ function doAdminNetworkProcessChangeNetwork () {
 }
 
 // Removes given networks
-function doAdminNetworkProcessRemoveNetwork () {
+function doAdminNetworkProcessRemoveNetworks () {
        // Do we have selections?
        if (ifPostContainsSelections()) {
                // By default nothing is removed
@@ -1113,9 +1113,9 @@ 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(postRequestElement('network_type_handle'), getRequestElement('network_id'))) {
+       if (isNetworkTypeHandleValid(postRequestElement('network_type_handler'), getRequestElement('network_id'))) {
                // Already added
-               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_TYPES_HANDLE_ALREADY_ADDED=' . postRequestElement('network_type_handle') . '%}');
+               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_HANDLER_TYPES_HANDLE_ALREADY_ADDED=' . postRequestElement('network_type_handler') . '%}');
 
                // ... so abort here
                return false;
@@ -1142,12 +1142,12 @@ function doAdminNetworkProcessAddNetworkType () {
                loadTemplate('admin_network_type_added', false, postRequestArray());
        } else {
                // Not added
-               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_TYPES_NOT_ADDED=' . postRequestElement('network_type_handle') . '%}');
+               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_HANDLER_TYPES_NOT_ADDED=' . postRequestElement('network_type_handler') . '%}');
        }
 }
 
 // Changes given network type handlers
-function doAdminNetworkProcessChangeNetworkType () {
+function doAdminNetworkProcessChangeHandlerTypes () {
        // Do we have selections?
        if (ifPostContainsSelections()) {
                // By default nothing is updated
@@ -1191,16 +1191,16 @@ function doAdminNetworkProcessChangeNetworkType () {
                // Do we have updates?
                if ($updated > 0) {
                        // Updates done
-                       displayMessage('{%message,ADMIN_NETWORK_TYPES_UPDATED=' . $updated . '%}');
+                       displayMessage('{%message,ADMIN_NETWORK_HANDLER_TYPES_UPDATED=' . $updated . '%}');
                } else {
                        // Nothing changed
-                       loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_TYPES_NOTHING_CHANGED--}');
+                       loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_HANDLER_TYPES_NOTHING_CHANGED--}');
                }
        } // END - if
 }
 
 // Changes given network request parameters
-function doAdminNetworkProcessChangeNetworkParam () {
+function doAdminNetworkProcessChangeRequestParams () {
        // Do we have selections?
        if (ifPostContainsSelections()) {
                // By default nothing is updated
@@ -1253,7 +1253,7 @@ function doAdminNetworkProcessChangeNetworkParam () {
 }
 
 // Removes given network type handlers
-function doAdminNetworkProcessRemoveNetworkType () {
+function doAdminNetworkProcessRemoveNetworkTypes () {
        // Do we have selections?
        if (ifPostContainsSelections()) {
                // By default nothing is removed
@@ -1271,16 +1271,16 @@ function doAdminNetworkProcessRemoveNetworkType () {
                // Do we have removes?
                if ($removed > 0) {
                        // Removals done
-                       displayMessage('{%message,ADMIN_NETWORK_TYPES_REMOVED=' . $removed . '%}');
+                       displayMessage('{%message,ADMIN_NETWORK_HANDLER_TYPES_REMOVED=' . $removed . '%}');
                } else {
                        // Nothing removed
-                       loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_TYPES_NOTHING_REMOVED--}');
+                       loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_HANDLER_TYPES_NOTHING_REMOVED--}');
                }
        } // END - if
 }
 
 // Removes given network request parameters
-function doAdminNetworkProcessRemoveNetworkParam () {
+function doAdminNetworkProcessRemoveNetworkRequestParams () {
        // Do we have selections?
        if (ifPostContainsSelections()) {
                // By default nothing is removed
@@ -1307,7 +1307,7 @@ function doAdminNetworkProcessRemoveNetworkParam () {
 }
 
 // Adds a request parameter to given network and type
-function doAdminNetworkProcessAddNetworkParam () {
+function doAdminNetworkProcessAddNetworkRequestParams () {
        // 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
@@ -1419,7 +1419,7 @@ function doAdminNetworkProcessNetworkApiConfig () {
 }
 
 // Only adds network type configuration if not yet present
-function doAdminNetworkProcessAddNetworkTypesConfig () {
+function doAdminNetworkProcessAddHandlerTypesConfig () {
        // Remove the 'ok' part
        unsetPostRequestElement('ok');
 
@@ -1454,7 +1454,7 @@ function doAdminNetworkProcessAddNetworkTypesConfig () {
        // Is there already an entry?
        if (isNetworkTypeHandlerConfigured(getRequestElement('network_id'), getRequestElement('network_type_id'))) {
                // This network type handler is already configured
-               displayMessage('{--ADMIN_NETWORK_TYPE_HANDLER_ALREADY_CONFIGURED--}');
+               displayMessage('{--ADMIN_NETWORK_HANDLER_TYPE_HANDLER_ALREADY_CONFIGURED--}');
                return;
        } // END - if
 
@@ -1467,15 +1467,15 @@ function doAdminNetworkProcessAddNetworkTypesConfig () {
        // Output message
        if (!SQL_HASZEROAFFECTED()) {
                // Successfully added
-               displayMessage('{--ADMIN_CONFIG_NETWORK_TYPE_HANDLER_SAVED--}');
+               displayMessage('{--ADMIN_CONFIG_NETWORK_HANDLER_TYPE_HANDLER_SAVED--}');
        } else {
                // Not added
-               loadTemplate('admin_settings_unsaved', false, '{--ADMIN_CONFIG_NETWORK_TYPE_HANDLER_NOT_SAVED--}');
+               loadTemplate('admin_settings_unsaved', false, '{--ADMIN_CONFIG_NETWORK_HANDLER_TYPE_HANDLER_NOT_SAVED--}');
        }
 }
 
 // Only changes network type configuration if not yet present
-function doAdminNetworkProcessEditNetworkTypesConfig () {
+function doAdminNetworkProcessEditHandlerTypesConfig () {
        // Remove the 'ok' part
        unsetPostRequestElement('ok');
 
@@ -1510,7 +1510,7 @@ function doAdminNetworkProcessEditNetworkTypesConfig () {
        // Is there already an entry?
        if (!isNetworkTypeHandlerConfigured(getRequestElement('network_id'), getRequestElement('network_type_id'))) {
                // This network type handler is not configured
-               displayMessage('{--ADMIN_NETWORK_TYPE_HANDLER_NOT_CONFIGURED--}');
+               displayMessage('{--ADMIN_NETWORK_HANDLER_TYPE_HANDLER_NOT_CONFIGURED--}');
                return;
        } // END - if
 
@@ -1523,10 +1523,10 @@ function doAdminNetworkProcessEditNetworkTypesConfig () {
        // Output message
        if (!SQL_HASZEROAFFECTED()) {
                // Successfully added
-               displayMessage('{--ADMIN_CONFIG_NETWORK_TYPE_HANDLER_SAVED--}');
+               displayMessage('{--ADMIN_CONFIG_NETWORK_HANDLER_TYPE_HANDLER_SAVED--}');
        } else {
                // Not added
-               loadTemplate('admin_settings_unsaved', false, '{--ADMIN_CONFIG_NETWORK_TYPE_HANDLER_NOT_CHANGED--}');
+               loadTemplate('admin_settings_unsaved', false, '{--ADMIN_CONFIG_NETWORK_HANDLER_TYPE_HANDLER_NOT_CHANGED--}');
        }
 }
 
@@ -1563,7 +1563,7 @@ function doAdminNetworkProcessExport () {
                // Network type handler
                'list_network_types'             => 'network_types',
                // Network request parameter
-               'list_network_params'            => 'network_request_params',
+               'list_network_request_params'    => 'network_request_params',
                // Network API response array index translation
                'list_network_array_translation' => 'network_array_translation',
        );
@@ -1655,7 +1655,7 @@ function doAdminNetworkExportNetworkTypes () {
        $result = SQL_QUERY_ESC('SELECT
        `network_type_id`,
        `network_id`,
-       `network_type_handle`,
+       `network_type_handler`,
        `network_type_api_url`,
        `network_type_click_url`,
        `network_type_banner_url`
@@ -1670,7 +1670,7 @@ ORDER BY
                ), __FUNCTION__, __LINE__);
 
        // Start an empty SQL query
-       $SQL = "<pre>INSERT INTO `&#123;&#63;_MYSQL_PREFIX&#63;&#125;_network_types` (`network_type_id`,`network_id`,`network_type_handle`,`network_type_api_url`,`network_type_click_url`,`network_type_banner_url`) VALUES\n";
+       $SQL = "<pre>INSERT INTO `&#123;&#63;_MYSQL_PREFIX&#63;&#125;_network_types` (`network_type_id`,`network_id`,`network_type_handler`,`network_type_api_url`,`network_type_click_url`,`network_type_banner_url`) VALUES\n";
 
        // Load all entries
        while ($content = SQL_FETCHARRAY($result)) {
@@ -1678,7 +1678,7 @@ ORDER BY
                $SQL .= '(' .
                        $content['network_type_id'] . ', ' .
                        $content['network_id'] . ", '" .
-                       $content['network_type_handle'] . "', '" .
+                       $content['network_type_handler'] . "', '" .
                        $content['network_type_api_url'] . "', '" .
                        $content['network_type_click_url'] . "', ";
                
@@ -1693,7 +1693,7 @@ ORDER BY
        } // END - while
 
        // Remove last commata and close braces
-       $SQL = substr($SQL, 0, -1) . '</pre>';
+       $SQL = substr($SQL, 0, -2) . '</pre>';
 
        // Free result
        SQL_FREERESULT($result);