X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_network_params.php;h=65a55abe35eb088493d28ca503bc1360a87a02cd;hb=d9f35786166902b9bc3f402d4f2abeed5ae0528d;hp=24657e39c224c8ac8eb4edbdf7b551fced580eaa;hpb=09f5758c42a33a56bdd461c946ffe759a59c54aa;p=mailer.git

diff --git a/inc/modules/admin/what-list_network_params.php b/inc/modules/admin/what-list_network_params.php
index 24657e39c2..65a55abe35 100644
--- a/inc/modules/admin/what-list_network_params.php
+++ b/inc/modules/admin/what-list_network_params.php
@@ -69,16 +69,16 @@ if (isGetRequestParameterSet('network')) {
 	$networkData = getNetworkDataById(getRequestParameter('network'));
 
 	// Init disabled list
-	$networkData['disabled'] = array();
+	$GLOBALS['network_params_disabled'] = array();
 
 	// Only show params from given type handler if choosen
 	$ADD = '';
-	if (isPostRequestParameterSet('network_type_id')) {
+	if ((isPostRequestParameterSet('network_type_id')) && (!is_array(postRequestParameter('network_type_id')))) {
 		// Only show from current type handler
 		$ADD = sprintf(" AND p.`network_type_id`=%s", bigintval(postRequestParameter('network_type_id')));
 
 		// Display message
-		loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NETWORK_PARAMS_LIST_LIMITED_TO_TYPE'));
+		loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NETWORK_REQUEST_PARAMS_LIST_LIMITED_TO_TYPE'));
 	} // END - if
 
 	// Load all advert types for given network
@@ -108,14 +108,11 @@ ORDER BY
 			// 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;
+				$GLOBALS['network_params_disabled'][$row['request_param_key']] = true;
 			} // 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);
@@ -134,60 +131,17 @@ ORDER BY
 		loadTemplate('admin_list_network_params', false, $content);
 	} else {
 		// No entries found
-		loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_NETWORK_PARAMS_404', $networkData['network_title']));
+		loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_NETWORK_REQUEST_PARAMS_404', $networkData['network_title']));
 	}
 
 	// 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'))
-	);
+	$networkData['type_options'] = generateNetworkTypeOptions(postRequestParameter('network_type_id'));
 
 	// Add options for parameter keys
-	$networkData['key_options'] = generateOptionList(
-		'/ARRAY/',
-		array(
-			'id',
-			'sid',
-			'hash',
-			'password',
-			'reload',
-			'max_stay',
-			'min_stay',
-			'currency',
-			'type',
-			'remain',
-			'reward',
-			'size',
-			'erotic',
-			'extra'
-		),
-		array(
-			'{--ADMIN_NETWORK_PARAMS_ID--}',
-			'{--ADMIN_NETWORK_PARAMS_SID--}',
-			'{--ADMIN_NETWORK_PARAMS_HASH--}',
-			'{--ADMIN_NETWORK_PARAMS_PASSWORD--}',
-			'{--ADMIN_NETWORK_PARAMS_RELOAD--}',
-			'{--ADMIN_NETWORK_PARAMS_MAXIMUM_STAY--}',
-			'{--ADMIN_NETWORK_PARAMS_MINIMUM_STAY--}',
-			'{--ADMIN_NETWORK_PARAMS_CURRENCY--}',
-			'{--ADMIN_NETWORK_PARAMS_TYPE--}',
-			'{--ADMIN_NETWORK_PARAMS_REMAIN--}',
-			'{--ADMIN_NETWORK_PARAMS_REWARD--}',
-			'{--ADMIN_NETWORK_PARAMS_SIZE--}',
-			'{--ADMIN_NETWORK_PARAMS_EROTIC--}',
-			'{--ADMIN_NETWORK_PARAMS_EXTRA--}'
-		),
-		'', '', '',
-		$networkData['disabled']
-	);
+	$networkData['key_options'] = generateNetworkRequestKeyOptions('');
 
 	// Add form for adding new params
 	loadTemplate('admin_add_network_params', false, $networkData);