More rewrites to make use of (cached) wrapper functions

[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 488f774618eb4443aac58966d1877325b2ba1d41..47f3b621897da2e56a451644c831e0cbffdcdc9e 100644 (file)
--- a/inc/modules/admin/what-list_network_params.php
+++ b/inc/modules/admin/what-list_network_params.php
@@ -78,7 +78,7 @@ if (isGetRequestParameterSet('network')) {
                $ADD = sprintf(" AND p.`network_type_id`=%s", bigintval(postRequestParameter('network_type_id')));
 
                // Display message
-               loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NETWORK_REQUEST_PARAMS_LIST_LIMITED_TO_TYPE'));
+               loadTemplate('admin_settings_saved', false, '{--ADMIN_NETWORK_REQUEST_PARAMETER_LIST_LIMITED_TO_TYPE--}');
        } // END - if
 
        // Load all advert types for given network
@@ -98,13 +98,10 @@ ORDER BY
                array(getRequestParameter('network')), __FILE__, __LINE__);
 
        // Do we have entries?
-       if (SQL_NUMROWS($result) > 0) {
+       if (!SQL_HASZERONUMS($result)) {
                // List all entries
-               $OUT = ''; $SW = 2;
+               $OUT = '';
                while ($row = SQL_FETCHARRAY($result)) {
-                       // 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
@@ -112,20 +109,16 @@ ORDER BY
                        } // END - if
 
                        // Is default value empty or null?
-                       if ((is_null($row['request_param_default'])) || (trim($row['request_param_default']) == '')) {
-                               // Fix it to three dashes
-                               $row['request_param_default'] = '---';
-                       } // END - if
+                       $row['request_param_default'] = fixNullEmptyToDashes($row['request_param_default'], 3);
 
                        // Add row template and switch color
                        $OUT .= loadTemplate('admin_list_network_params_row', true, $row);
-                       $SW = 3 - $SW;
                } // END - while
 
                // Prepare data for template
                $content = array(
                        'rows'            => $OUT,
-                       'network_id'      => getRequestParameter('network'),
+                       'network_id'      => bigintval(getRequestParameter('network')),
                        'network_title'   => $networkData['network_title'],
                        'network_reflink' => $networkData['network_reflink'],
                );
@@ -134,18 +127,12 @@ ORDER BY
                loadTemplate('admin_list_network_params', false, $content);
        } else {
                // No entries found
-               loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_NETWORK_REQUEST_PARAMS_404', $networkData['network_title']));
+               loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_NETWORK_REQUEST_PARAMETER_404', $networkData['network_title']));
        }
 
        // Free result
        SQL_FREERESULT($result);
 
-       // Add options list for network type
-       $networkData['type_options'] = generateNetworkTypeOptions(postRequestParameter('network_type_id'));
-
-       // Add options for parameter keys
-       $networkData['key_options'] = generateNetworkRequestKeyOptions('');
-
        // Add form for adding new params
        loadTemplate('admin_add_network_params', false, $networkData);
 } else {