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 1f865f76a8be377a832510477b0bdf75590470af..5c9515f24ae52d3bc96d2a6bd6edfb20c46cda14 100644 (file)
--- a/inc/libs/network_functions.php
+++ b/inc/libs/network_functions.php
@@ -126,7 +126,7 @@ function isNetworkTypeHandleValid ($type, $networkId) {
 // Checks wether the given network request parameter is already used (valid)
 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 `network_request_param_key`='%s' LIMIT 1",
+       $result = SQL_QUERY_ESC("SELECT `network_request_param_id` FROM `{?_MYSQL_PREFIX?}_network_request_params` WHERE `network_id`=%s AND `network_type_id`=%s AND `network_request_param_key`='%s' LIMIT 1",
                array($networkId, $type, $key), __FUNCTION__, __LINE__);
 
        // Does it exist?
@@ -325,7 +325,7 @@ function getNetworkRequestParamsDataById ($networkId) {
 
        // Query for the network data
        $result = SQL_QUERY_ESC("SELECT
-       `network_param_id`,
+       `network_request_param_id`,
        `network_id`,
        `network_type_id`,
        `network_request_param_key`,
@@ -334,7 +334,7 @@ function getNetworkRequestParamsDataById ($networkId) {
 FROM
        `{?_MYSQL_PREFIX?}_network_request_params`
 WHERE
-       `network_param_id`=%s
+       `network_request_param_id`=%s
 LIMIT 1",
                array(bigintval($networkId)), __FUNCTION__, __LINE__);
 
@@ -384,7 +384,7 @@ function doNetworkUpdateParamsByArray ($networkId, $networkParamData) {
        } // END - if
 
        // Just call our inner method
-       return adminSaveSettings($networkParamData, '_network_request_params', sprintf("`network_param_id`=%s", bigintval($networkId)), array(), false, false);
+       return adminSaveSettings($networkParamData, '_network_request_params', sprintf("`network_request_param_id`=%s", bigintval($networkId)), array(), false, false);
 }
 
 // Removes given network entry
@@ -1268,7 +1268,7 @@ function doAdminNetworkProcessRemoveNetworkParam () {
                        // Update this entry?
                        if ($sel == 1) {
                                // Remove this entry
-                               $removed += doAdminRemoveNetworkEntry('request_params', 'network_param_id', $networkId);
+                               $removed += doAdminRemoveNetworkEntry('request_params', 'network_request_param_id', $networkId);
                        } // END - if
                } // END - foreach
 
@@ -1312,7 +1312,7 @@ function doAdminNetworkProcessAddNetworkParam () {
        // Output message
        if (!SQL_HASZEROAFFECTED()) {
                // Successfully added
-               loadTemplate('admin_network_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') . '%}');