Bad things are now 'classified' as bad (CSS class 'bad' is being used instead of...

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

diff --git a/inc/libs/network_functions.php b/inc/libs/network_functions.php
index 6d6e3b7e666bf42fcadc448a74db581d62f2e40b..0c71a5269b071282c9a52cb1054abee17311d5cf 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
@@ -404,7 +404,9 @@ function generateAdminNetworkList () {
 
        // Query for all networks
        $result = SQL_QUERY('SELECT
-       `network_id`,`network_short_name`,`network_title`
+       `network_id`,
+       `network_short_name`,
+       `network_title`
 FROM
        `{?_MYSQL_PREFIX?}_network_data`
 ORDER BY
@@ -423,7 +425,7 @@ ORDER BY
                } // END - while
 
                // Generate the selection box
-               $content = generateSelectionBoxFromArray($rows, 'network', 'network_id');
+               $content = generateSelectionBoxFromArray($rows, 'network_id', 'network_id', '', '', 'network');
        } else {
                // Nothing selected
                $content = loadTemplate('admin_settings_unsaved', false, '{--ADMIN_ENTRIES_404--}');
@@ -543,7 +545,7 @@ function generateNetworkTypeOptions ($networkId) {
                        '',
                        sprintf(
                                "WHERE `network_id`=%s",
-                               bigintval(getRequestElement('network'))
+                               bigintval(getRequestElement('network_id'))
                        ),
                        '',
                        'translateNetworkTypeHandler'
@@ -818,13 +820,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());
@@ -893,7 +889,7 @@ function doAdminNetworkProcessHandleNetworkType () {
        // Do we have selections?
        if (ifPostContainsSelections()) {
                // Load network data
-               $networkData = getNetworkDataById(getRequestElement('network'));
+               $networkData = getNetworkDataById(getRequestElement('network_id'));
 
                // Something has been selected, so start displaying one by one
                $OUT = '';
@@ -948,7 +944,7 @@ function doAdminNetworkProcessHandleRequestParams () {
                $GLOBALS['network_params_disabled'] = array();
 
                // Load network data
-               $networkData = getNetworkDataById(getRequestElement('network'));
+               $networkData = getNetworkDataById(getRequestElement('network_id'));
 
                // Something has been selected, so start displaying one by one
                $OUT = '';
@@ -1075,7 +1071,7 @@ 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'))) {
+       if (isNetworkTypeHandleValid(postRequestElement('network_type_handle'), getRequestElement('network_id'))) {
                // Already added
                loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_TYPES_HANDLE_ALREADY_ADDED=' . postRequestElement('network_type_handle') . '%}');
 
@@ -1087,7 +1083,7 @@ function doAdminNetworkProcessAddNetworkType () {
        unsetPostRequestElement('ok');
 
        // Add id
-       setPostRequestElement('network_id', bigintval(getRequestElement('network')));
+       setPostRequestElement('network_id', bigintval(getRequestElement('network_id')));
 
        // Is network_type_banner_url set?
        if (postRequestElement('network_type_banner_url') == '') {
@@ -1096,13 +1092,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 +1184,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 +1267,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_id'))) {
                // 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;
@@ -1289,37 +1279,31 @@ function doAdminNetworkProcessAddNetworkParam () {
        unsetPostRequestElement('ok');
 
        // Add id
-       setPostRequestElement('network_id', bigintval(getRequestElement('network')));
+       setPostRequestElement('network_id', bigintval(getRequestElement('network_id')));
 
-       // 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') . '%}');
        }
 }
 
 // Adds a API response array entry
 function doAdminNetworkProcessAddNetworkApiTranslation () {
        // Is the request parameter already used with given network?
-       if (isNetworkApiTranslationValid(postRequestElement('network_api_index'), postRequestElement('network_type_id'), getRequestElement('network'))) {
+       if (isNetworkApiTranslationValid(postRequestElement('network_api_index'), postRequestElement('network_type_id'), getRequestElement('network_id'))) {
                // Already added
                loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_NETWORK_API_TRANSLATION_ALREADY_ADDED=' . postRequestElement('network_api_index') . '%}');
 
@@ -1331,7 +1315,7 @@ function doAdminNetworkProcessAddNetworkApiTranslation () {
        unsetPostRequestElement('ok');
 
        // Add id
-       setPostRequestElement('network_id', bigintval(getRequestElement('network')));
+       setPostRequestElement('network_id', bigintval(getRequestElement('network_id')));
 
        // Add sorting
        setPostRequestElement('sort', (countSumTotalData(
@@ -1344,13 +1328,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()) {
@@ -1368,21 +1346,21 @@ function doAdminNetworkProcessNetworkApiConfig () {
        unsetPostRequestElement('ok');
 
        // Add id
-       setPostRequestElement('network_id', bigintval(getRequestElement('network')));
+       setPostRequestElement('network_id', bigintval(getRequestElement('network_id')));
+
+       // Is network_api_referral_button set?
+       if (postRequestElement('network_api_referral_button') == '') {
+               // Remove empty value to get a NULL for an optional entry
+               unsetPostRequestElement('network_api_referral_button');
+       } // END - if
 
        // Is there already an entry?
-       if (isNetworkApiConfigured(getRequestElement('network'))) {
+       if (isNetworkApiConfigured(getRequestElement('network_id'))) {
                // Generate SQL query
                $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