X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_network_array_translation.php;h=4b7a3734d3582d2b35b985e2aafe19b8094dd846;hb=2b55889fa41363630a0bb759e97868032983dc56;hp=112bf491e070e6073875acf440b95f8e11f1d175;hpb=22ba0c36c75ff989a6f48197c5a71524fb891b87;p=mailer.git

diff --git a/inc/modules/admin/what-list_network_array_translation.php b/inc/modules/admin/what-list_network_array_translation.php
index 112bf491e0..4b7a3734d3 100644
--- a/inc/modules/admin/what-list_network_array_translation.php
+++ b/inc/modules/admin/what-list_network_array_translation.php
@@ -10,16 +10,14 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Verwaltet API-Abfrageparameter                   *
  * -------------------------------------------------------------------- *
- * $Revision:: 1794                                                   $ *
- * $Date:: 2010-05-28 19:55:19 +0200 (Fri, 28 May 2010)               $ *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
- * $Author:: quix0r                                                   $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
+ * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -43,7 +41,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 } // END - if
 
 // Add description as navigation point
-addMenuDescription('admin', __FILE__);
+addYouAreHereLink('admin', __FILE__);
 
 // These are expert settings!
 if (doVerifyExpertSettings() != 'agreed') {
@@ -64,25 +62,36 @@ if ($GLOBALS['network_display'] === false) {
 } // END - if
 
 // Do we have a network selected?
-if (isGetRequestParameterSet('network')) {
+if (isGetRequestElementSet('network_id')) {
 	// Get its data for template
-	$networkData = getNetworkDataById(getRequestParameter('network'));
+	$networkData = getNetworkDataById(getRequestElement('network_id'));
 
-	// Is a network type selected?
-	if (!isGetRequestParameterSet('network_type')) {
-		// Then present a new selection form
-		outputHtml(generateAdminNetworkTypeList(getRequestParameter('network'), getRequestParameter('network_type')));
-
-		// Abort any other processing
-		return;
-	} // END - if
+	// Init type
+	$networkData['network_type_id'] = 0;
 
 	// Init disabled list
-	$GLOBALS['network_array_translation_disabled'] = array();
+	$GLOBALS['network_translation_disabled'] = array();
+
+	// Only show params from given type handler if choosen
+	$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')));
+
+		// Overwrite type
+		$networkData['network_type_id'] = bigintval(postRequestElement('network_type_id'));
+
+		// Display message
+		displayMessage('{--ADMIN_LIST_NETWORK_ARRAY_TRANSLATION_LIMITED_TO_TYPE--}');
+	} // END - if
 
 	// Load all advert codes for given network
 	$result = SQL_QUERY_ESC("SELECT
-	p.`network_array_id`, t.`network_type_id`, t.`network_type_handle`, p.`network_array_index`, p.`network_index_translation`
+	p.`network_array_id`,
+	t.`network_type_id`,
+	t.`network_type_handler`,
+	p.`network_array_index`,
+	p.`sort`
 FROM
 	`{?_MYSQL_PREFIX?}_network_array_translation` AS p
 INNER JOIN
@@ -90,60 +99,40 @@ INNER JOIN
 ON
 	p.`network_type_id`=t.`network_type_id`
 WHERE
-	p.`network_id`=%s AND
-	p.`network_type_id`=%s
+	p.`network_id`=%s
+	".$ADD."
 ORDER BY
-	t.`network_type_handle` ASC,
+	t.`network_type_handler` ASC,
 	p.`network_array_id` ASC",
 		array(
-			bigintval(getRequestParameter('network')),
-			bigintval(getRequestParameter('network_type'))
+			bigintval(getRequestElement('network_id'))
 		), __FILE__, __LINE__);
 
-	// Remember the rows
-	$rows = SQL_NUMROWS($result);
-
 	// Do we have entries?
-	if ($rows > 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'] == getRequestParameter('network_type_id')) {
+			if ($row['network_type_id'] == postRequestElement('network_type_id')) {
 				// Matches, then add it for disabling this entry
-				$GLOBALS['network_array_translation_disabled'][$row['network_array_index']] = true;
+				$GLOBALS['network_translation_disabled'][$row['network_array_index']] = true;
 			} // END - if
 
 			// Add row template and switch color
 			$OUT .= loadTemplate('admin_list_network_array_translation_row', true, $row);
-			$SW = 3 - $SW;
 		} // END - while
 
-		// Prepare data for template
-		$content = array(
-			'rows'              => $OUT,
-			'network_id'        => bigintval(getRequestParameter('network')),
-			'network_title'     => $networkData['network_title'],
-			'network_reflink'   => $networkData['network_reflink'],
-		);
-
 		// Load main template
-		loadTemplate('admin_list_network_array_translation', false, $content);
+		loadTemplate('admin_list_network_array_translation', false, $OUT);
 	} else {
 		// No entries found
-		loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_NETWORK_ARRAY_TRANSLATION_404', $networkData['network_title']));
+		displayMessage('{%message,ADMIN_NETWORK_ARRAY_TRANSLATION_404=' . $networkData['network_title'] . '%}');
 	}
 
 	// Free result
 	SQL_FREERESULT($result);
 
-	// Add options list for network type
-	$networkData['translation_index'] = ($rows + 1);
-	$networkData['type_options']      = generateNetworkTypeOptions(getRequestParameter('network_type_id'));
-
 	// Add form for adding new array_translation pair
 	loadTemplate('admin_add_network_array_translation', false, $networkData);
 } else {