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 6d6e3b7e666bf42fcadc448a74db581d62f2e40b..592ee41febc5161e9405d866df1f79ea32e96163 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 `request_param_key`='%s' LIMIT 1",
+       $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",
                array($networkId, $type, $key), __FUNCTION__, __LINE__);
 
        // Does it exist?
@@ -328,9 +328,9 @@ function getNetworkRequestParamsDataById ($networkId) {
        `network_param_id`,
        `network_id`,
        `network_type_id`,
-       `request_param_key`,
-       `request_param_value`,
-       `request_param_default`
+       `network_request_param_key`,
+       `network_request_param_value`,
+       `network_request_param_default`
 FROM
        `{?_MYSQL_PREFIX?}_network_request_params`
 WHERE
@@ -818,13 +818,7 @@ function doAdminNetworkProcessAddNetwork () {
        unsetPostRequestElement('ok');
 
        // Add the whole request to database
-       SQL_QUERY('INSERT INTO
-       `{?_MYSQL_PREFIX?}_network_data`
-(
-       `' . implode('`,`', array_keys(postRequestArray())) . "`
-) VALUES (
-       '" . implode("','", array_values(postRequestArray())) . "'
-)", __FUNCTION__, __LINE__);
+       SQL_QUERY(getInsertSqlFromArray(postRequestArray(), 'network_data'), __FUNCTION__, __LINE__);
 
        // Add the id for output only
        setPostRequestElement('network_id', SQL_INSERTID());
@@ -1096,13 +1090,7 @@ function doAdminNetworkProcessAddNetworkType () {
        } // END - if
 
        // Add the whole request to database
-       SQL_QUERY('INSERT INTO
-       `{?_MYSQL_PREFIX?}_network_types`
-(
-       `' . implode('`,`', array_keys(postRequestArray())) . "`
-) VALUES (
-       '" . implode("','", array_values(postRequestArray())) . "'
-)", __FUNCTION__, __LINE__);
+       SQL_QUERY(getInsertSqlFromArray(postRequestArray(), 'network_types'), __FUNCTION__, __LINE__);
 
        // Output message
        if (!SQL_HASZEROAFFECTED()) {
@@ -1194,8 +1182,8 @@ function doAdminNetworkProcessChangeNetworkParam () {
                                                debug_report_bug(__FUNCTION__, __LINE__, 'No entry in key=' . $key . ', id=' . $networkId . ' found.');
                                        } // END - if
 
-                                       // Fix empty request_param_default to NULL
-                                       if (($key == 'request_param_default') && (trim($entry[$networkId]) == '')) {
+                                       // Fix empty network_request_param_default to NULL
+                                       if (($key == 'network_request_param_default') && (trim($entry[$networkId]) == '')) {
                                                // Set it to NULL
                                                $entry[$networkId] = NULL;
                                        } // END - if
@@ -1277,9 +1265,9 @@ function doAdminNetworkProcessRemoveNetworkParam () {
 // Adds a request parameter to given network and type
 function doAdminNetworkProcessAddNetworkParam () {
        // Is the request parameter already used with given network?
-       if (isNetworkRequestElementValid(postRequestElement('request_param_key'), postRequestElement('network_type_id'), getRequestElement('network'))) {
+       if (isNetworkRequestElementValid(postRequestElement('network_request_param_key'), postRequestElement('network_type_id'), getRequestElement('network'))) {
                // Already added
-               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_REQUEST_PARAMETER_ALREADY_ADDED=' . postRequestElement('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;
@@ -1291,28 +1279,22 @@ function doAdminNetworkProcessAddNetworkParam () {
        // Add id
        setPostRequestElement('network_id', bigintval(getRequestElement('network')));
 
-       // Is request_param_default set?
-       if (postRequestElement('request_param_default') == '') {
+       // Is network_request_param_default set?
+       if (postRequestElement('network_request_param_default') == '') {
                // Remove empty value to get a NULL for an optional entry
-               unsetPostRequestElement('request_param_default');
+               unsetPostRequestElement('network_request_param_default');
        } // END - if
 
        // Add the whole request to database
-       SQL_QUERY('INSERT INTO
-       `{?_MYSQL_PREFIX?}_network_request_params`
-(
-       `' . implode('`,`', array_keys(postRequestArray())) . "`
-) VALUES (
-       '" . implode("','", array_values(postRequestArray())) . "'
-)", __FUNCTION__, __LINE__);
+       SQL_QUERY(getInsertSqlFromArray(postRequestArray(), 'network_request_params'), __FUNCTION__, __LINE__);
 
        // Output message
        if (!SQL_HASZEROAFFECTED()) {
                // Successfully added
-               loadTemplate('admin_network_request_param_added', false, postRequestArray());
+               loadTemplate('admin_network_network_request_param_added', false, postRequestArray());
        } else {
                // Not added
-               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_REQUEST_PARAMETER_NOT_ADDED=' . postRequestElement('request_param_key') . '%}');
+               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_REQUEST_PARAMETER_NOT_ADDED=' . postRequestElement('network_request_param_key') . '%}');
        }
 }
 
@@ -1344,13 +1326,7 @@ function doAdminNetworkProcessAddNetworkApiTranslation () {
        ) + 1));
 
        // Add the whole request to database
-       SQL_QUERY('INSERT INTO
-       `{?_MYSQL_PREFIX?}_network_api_translation`
-(
-       `' . implode('`,`', array_keys(postRequestArray())) . "`
-) VALUES (
-       '" . implode("','", array_values(postRequestArray())) . "'
-)", __FUNCTION__, __LINE__);
+       SQL_QUERY(getInsertSqlFromArray(postRequestArray(), 'network_api_translation'), __FUNCTION__, __LINE__);
 
        // Output message
        if (!SQL_HASZEROAFFECTED()) {
@@ -1376,13 +1352,7 @@ function doAdminNetworkProcessNetworkApiConfig () {
                $SQL = getUpdateSqlFromArray(postRequestArray(), 'network_api_config', 'network_id', postRequestElement('network_id'), array('network_id'));
        } else {
                // Insert new entry
-               $SQL = 'INSERT INTO
-       `{?_MYSQL_PREFIX?}_network_api_config`
-(
-       `' . implode('`,`', array_keys(postRequestArray())) . "`
-) VALUES (
-       '" . implode("','", array_values(postRequestArray())) . "'
-)";
+               $SQL = getInsertSqlFromArray(postRequestArray(), 'network_api_config');
        }
 
        // Run the query