fooRequestElementBar() functions renamed, adding of request parameters added:

[mailer.git] / inc / modules / admin / what-list_network_params.php

diff --git a/inc/modules/admin/what-list_network_params.php b/inc/modules/admin/what-list_network_params.php
index ce21dc9116b3b17d2d16cd2e69ec87d4e6023344..ef5f8443f85a3327b0b60cc9130ea82b8f2892ea 100644 (file)
--- a/inc/modules/admin/what-list_network_params.php
+++ b/inc/modules/admin/what-list_network_params.php
@@ -63,20 +63,28 @@ if ($GLOBALS['network_display'] === false) {
 } // END - if
 
 // Do we have a network selected?
-if (isGetRequestElementSet('network')) {
+if (isGetRequestParameterSet('network')) {
        // Get its data for template
-       $networkData = getNetworkDataById(getRequestElement('network'));
+       $networkData = getNetworkDataById(getRequestParameter('network'));
+
+       // Init disabled list
+       $networkData['disabled'] = array();
 
        // Load all advert types for given network
        $result = SQL_QUERY_ESC("SELECT
-       `network_param_id`, `request_param_key`, `request_param_value`
+       p.`network_param_id`, t.`network_type_id`, t.`network_type_handle`, p.`request_param_key`, p.`request_param_value`
 FROM
-       `{?_MYSQL_PREFIX?}_network_request_params`
+       `{?_MYSQL_PREFIX?}_network_request_params` AS p
+INNER JOIN
+       `{?_MYSQL_PREFIX?}_network_types` AS t
+ON
+       p.`network_type_id`=t.`network_type_id`
 WHERE
-       `network_id`=%s
+       p.`network_id`=%s
 ORDER BY
-       `request_param_key` ASC",
-               array(getRequestElement('network')), __FILE__, __LINE__);
+       t.`network_type_handle` ASC,
+       p.`network_param_id` ASC",
+               array(getRequestParameter('network')), __FILE__, __LINE__);
 
        // Do we have entries?
        if (SQL_NUMROWS($result) > 0) {
@@ -86,6 +94,12 @@ ORDER BY
                        // Add/translate some data
                        $row['sw'] = $SW;
 
+                       // Add it to network if the type matches selected
+                       if ($row['network_type_id'] == postRequestParameter('network_type_id')) {
+                               // Matches, then add it for disabling this entry
+                               $networkData['disabled'][$row['request_param_key']] = true;
+                       } // END - if
+
                        // Add row template and switch color
                        $OUT .= loadTemplate('admin_list_network_params_row', true, $row);
                        $SW = 3 - $SW;
@@ -94,7 +108,7 @@ ORDER BY
                // Prepare data for template
                $content = array(
                        'rows'            => $OUT,
-                       'network_id'      => getRequestElement('network'),
+                       'network_id'      => getRequestParameter('network'),
                        'network_title'   => $networkData['network_title'],
                        'network_reflink' => $networkData['network_reflink'],
                );
@@ -109,6 +123,45 @@ ORDER BY
        // Free result
        SQL_FREERESULT($result);
 
+       // Add options list for network type
+       $networkData['type_options'] = generateOptionList(
+               'network_types',
+               'network_type_id',
+               'network_type_handle',
+               postRequestParameter('network_type_id'),
+               '',
+               sprintf("WHERE `network_id`=%s", getRequestParameter('network'))
+       );
+
+       // Add options for parameter keys
+       $networkData['key_options'] = generateOptionList(
+               '/ARRAY/',
+               array(
+                       'id',
+                       'sid',
+                       'password',
+                       'reload',
+                       'min_stay',
+                       'remain',
+                       'reward',
+                       'size',
+                       'erotic'
+               ),
+               array(
+                       '{--ADMIN_NETWORK_PARAMS_ID--}',
+                       '{--ADMIN_NETWORK_PARAMS_SID--}',
+                       '{--ADMIN_NETWORK_PARAMS_PASSWORD--}',
+                       '{--ADMIN_NETWORK_PARAMS_RELOAD--}',
+                       '{--ADMIN_NETWORK_PARAMS_MINIMUM_STAY--}',
+                       '{--ADMIN_NETWORK_PARAMS_REMAIN--}',
+                       '{--ADMIN_NETWORK_PARAMS_REWARD--}',
+                       '{--ADMIN_NETWORK_PARAMS_SIZE--}',
+                       '{--ADMIN_NETWORK_PARAMS_EROTIC--}'
+               ),
+               '', '', '',
+               $networkData['disabled']
+       );
+
        // Add form for adding new params
        loadTemplate('admin_add_network_params', false, $networkData);
 } else {