X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_network_request_params.php;h=1f2487e30bae5e2121f871bc711688345797b340;hb=e5527fd38a6585c8466dc28d013f12d21eb7c07a;hp=116c9592bbea90d676952c590d1ba1f1f7bd361d;hpb=63f159414369b5ea19a8ca75d8cd8033c45d8341;p=mailer.git

diff --git a/inc/modules/admin/what-list_network_request_params.php b/inc/modules/admin/what-list_network_request_params.php
index 116c9592bb..1f2487e30b 100644
--- a/inc/modules/admin/what-list_network_request_params.php
+++ b/inc/modules/admin/what-list_network_request_params.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -50,21 +50,21 @@ if (doVerifyExpertSettings() != 'agreed') {
 } // END - if
 
 // By default we should display list/add new forms
-$GLOBALS['network_display'] = true;
+$GLOBALS['network_display'] = TRUE;
 
 // Handle form here
 doNetworkHandleForm();
 
 // Display forms?
-if ($GLOBALS['network_display'] === false) {
+if ($GLOBALS['network_display'] === FALSE) {
 	// Abort here
 	return;
 } // END - if
 
-// Do we have a network selected?
+// Is there a network selected?
 if (isGetRequestElementSet('network_id')) {
 	// Get its data for template
-	$networkData = getNetworkDataById(getRequestElement('network_id'));
+	$networkData = getNetworkDataFromId(getRequestElement('network_id'));
 	$networkData['network_type_id'] = 0;
 
 	// Init disabled list
@@ -74,7 +74,7 @@ if (isGetRequestElementSet('network_id')) {
 	$ADD = '';
 	if ((isPostRequestElementSet('network_type_id')) && (!is_array(postRequestElement('network_type_id')))) {
 		// Only show from current type handler
-		$ADD = sprintf(" AND p.`network_type_id`=%s", bigintval(postRequestElement('network_type_id')));
+		$ADD = sprintf(" AND `p`.`network_type_id`=%s", bigintval(postRequestElement('network_type_id')));
 
 		// Overwrite type id
 		$networkData['network_type_id'] = bigintval(postRequestElement('network_type_id'));
@@ -84,59 +84,68 @@ if (isGetRequestElementSet('network_id')) {
 	} // END - if
 
 	// Load all advert types for given network
-	$result = SQL_QUERY_ESC("SELECT
-	p.`network_request_param_id`,
-	t.`network_type_id`,
-	t.`network_type_handler`,
-	p.`network_request_param_key`,
-	p.`network_request_param_value`,
-	p.`network_request_param_default`
+	$result = sqlQueryEscaped("SELECT
+	`p`.`network_request_param_id`,
+	`t`.`network_type_id`,
+	`t`.`network_type_handler`,
+	`p`.`network_request_param_key`,
+	`p`.`network_request_param_value`,
+	`p`.`network_request_param_default`
 FROM
-	`{?_MYSQL_PREFIX?}_network_request_params` AS p
+	`{?_MYSQL_PREFIX?}_network_request_params` AS `p`
 INNER JOIN
-	`{?_MYSQL_PREFIX?}_network_types` AS t
+	`{?_MYSQL_PREFIX?}_network_types` AS `t`
 ON
-	p.`network_type_id`=t.`network_type_id`
+	`p`.`network_type_id`=`t`.`network_type_id`
 WHERE
-	p.`network_id`=%s".$ADD."
+	`p`.`network_id`=%s" . $ADD . "
 ORDER BY
-	t.`network_type_handler` ASC,
-	p.`network_request_param_id` ASC",
-		array(getRequestElement('network_id')), __FILE__, __LINE__);
+	`t`.`network_type_handler` ASC,
+	`p`.`network_request_param_id` ASC",
+		array(bigintval(getRequestElement('network_id'))), __FILE__, __LINE__);
 
-	// Do we have entries?
-	if (!SQL_HASZERONUMS($result)) {
+	// Are there entries?
+	if (!ifSqlHasZeroNums($result)) {
 		// List all entries
 		$OUT = '';
-		while ($row = SQL_FETCHARRAY($result)) {
+		while ($row = sqlFetchArray($result)) {
 			// Add it to network if the type matches selected
 			if ($row['network_type_id'] == postRequestElement('network_type_id')) {
 				// Matches, then add it for disabling this entry
-				$GLOBALS['network_request_params_disabled'][$row['network_request_param_key']] = true;
+				$GLOBALS['network_request_params_disabled'][$row['network_request_param_key']] = TRUE;
 			} // END - if
 
-			// Is default value empty or null?
-			$row['network_request_param_default'] = fixNullEmptyToDashes($row['network_request_param_default'], 3);
-
 			// Add row template and switch color
-			$OUT .= loadTemplate('admin_list_network_request_params_row', true, $row);
+			$OUT .= loadTemplate('admin_list_network_request_params_row', TRUE, $row);
 		} // END - while
 
+		// Prepare content array
+		$content = array(
+			'rows'       => $OUT,
+			'network_id' => bigintval(getRequestElement('network_id'))
+		);
+
 		// Load main template
-		loadTemplate('admin_list_network_request_params', false, $OUT);
+		loadTemplate('admin_list_network_request_params', FALSE, $content);
 	} else {
 		// No entries found
 		displayMessage('{%message,ADMIN_NETWORK_REQUEST_PARAMETER_404=' . $networkData['network_title'] . '%}');
 	}
 
 	// Free result
-	SQL_FREERESULT($result);
+	sqlFreeResult($result);
 
 	// Add form for adding new params
-	loadTemplate('admin_add_network_request_param', false, $networkData);
+	loadTemplate('admin_add_network_request_param', FALSE, $networkData);
 } else {
 	// Generate network list for this script
-	outputHtml(generateAdminNetworkList());
+	$OUT = generateAdminNetworkList();
+
+	// Is it not empty?
+	if (!empty($OUT)) {
+		// Output it
+		outputHtml($OUT);
+	} // END - if
 }
 
 // [EOF]