X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-config_network_types.php;h=df245ec0f358293a38b70021cb0d095e617550b4;hp=01800dc75f0468fdf1c42a404f61993d2b7f17ea;hb=4f7df133f736da124e6f7bd02008b9093f736451;hpb=8ce32e702f3caa76b8d446902948e83e1e6854c8

diff --git a/inc/modules/admin/what-config_network_types.php b/inc/modules/admin/what-config_network_types.php
index 01800dc75f..df245ec0f3 100644
--- a/inc/modules/admin/what-config_network_types.php
+++ b/inc/modules/admin/what-config_network_types.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -44,18 +44,18 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 addYouAreHereLink('admin', __FILE__);
 
 // 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')) {
 	// Set current network id
 	setCurrentNetworkId(getRequestElement('network_id'));
@@ -64,42 +64,62 @@ if (isGetRequestElementSet('network_id')) {
 	if (isGetRequestElementSet('network_type_id')) {
 		// Load data for given network
 		$result = SQL_QUERY_ESC('SELECT
-	`network_id`,
-	`network_type_id`,
-	`network_type_handle`,
-	`network_type_reload_time_unit`,
+	`t`.`network_id`,
+	`t`.`network_type_id`,
+	`t`.`network_type_handler`,
+	`t`.`network_type_reload_time_unit`,
+	`d`.`network_active`,
 	NULL AS `network_data_id`,
 	NULL AS `network_max_reload_time`,
 	NULL AS `network_min_waiting_time`,
+	NULL AS `network_max_waiting_time`,
+	NULL AS `network_min_remain_budget`,
 	NULL AS `network_min_remain_clicks`,
 	NULL AS `network_min_payment`,
-	NULL AS `network_allow_erotic`
+	NULL AS `network_allow_erotic`,
+	NULL AS `network_media_size`,
+	NULL AS `network_media_output`
 FROM
-	`{?_MYSQL_PREFIX?}_network_types`
+	`{?_MYSQL_PREFIX?}_network_types` AS `t`
+INNER JOIN
+	`{?_MYSQL_PREFIX?}_network_data` AS `d`
+ON
+	d.network_id=t.network_id
 WHERE
-	`network_id`=%s AND
-	`network_type_id`=%s
+	`t`.`network_id`=%s AND
+	`t`.`network_type_id`=%s
 LIMIT 1',
 			array(
 				bigintval(getRequestElement('network_id')),
 				bigintval(getRequestElement('network_type_id'))
 			), __FUNCTION__, __LINE__);
 
-		// Do we have a record?
+		// Is there a record?
 		if (SQL_NUMROWS($result) == 1) {
 			// Load it
 			$content = SQL_FETCHARRAY($result);
 
+			// Is the network active?
+			if (($content['network_active'] == 'N') && (!isAdminsExpertWarningEnabled()) && (!isDebugModeEnabled())) {
+				// Not active
+				displayMessage('{--ADMIN_NETWORK_NOT_ACTIVE--}');
+				return;
+			} // END - if
+
 			// Check for network type configuration
 			$result_config = SQL_QUERY_ESC('SELECT
 	`network_data_id`,
 	`network_max_reload_time`,
 	`network_min_waiting_time`,
+	`network_max_waiting_time`,
+	`network_min_remain_budget`,
 	`network_min_remain_clicks`,
 	`network_min_payment`,
-	`network_allow_erotic`
+	`network_allow_erotic`,
+	`network_media_size`,
+	`network_media_output`
 FROM
-	`{?_MYSQL_PREFIX?}_network_types_config`
+	`{?_MYSQL_PREFIX?}_network_handler_config`
 WHERE
 	`network_id`=%s AND
 	`network_type_id`=%s
@@ -128,13 +148,13 @@ LIMIT 1',
 			$content['network_max_reload_time']  = createTimeSelections($content['network_max_reload_time'], 'network_max_reload_time', 'WDhms');
 
 			// Load template
-			loadTemplate($templateName, false, $content);
+			loadTemplate($templateName, FALSE, $content);
 
 			// Abort here
 			return;
 		} else {
 			// No entry found
-			displayMessage('{%message,ADMIN_ADD_CONFIG_NETWORK_TYPE_404', bigintval(getRequestElement('network_id')) . '/' . bigintval(getRequestElement('network_type_id')));
+			displayMessage('{%message,ADMIN_ADD_CONFIG_NETWORK_HANDLER_TYPE_404=' . bigintval(getRequestElement('network_id')) . '/' . bigintval(getRequestElement('network_type_id')) . '%}');
 		} // END - if
 
 		// Free result
@@ -145,19 +165,19 @@ LIMIT 1',
 	$result = SQL_QUERY_ESC('SELECT
 	`network_id`,
 	`network_type_id`,
-	`network_type_handle`,
+	`network_type_handler`,
 	`network_type_reload_time_unit`
 FROM
 	`{?_MYSQL_PREFIX?}_network_types`
 WHERE
 	`network_id`=%s
 ORDER BY
-	`network_type_handle` ASC',
+	`network_type_handler` ASC',
 		array(
 			bigintval(getRequestElement('network_id'))
 		), __FUNCTION__, __LINE__);
 
-	// Do we have entries left?
+	// Are there entries left?
 	if (!SQL_HASZERONUMS($result)) {
 		// Init row output
 		$OUT = '';
@@ -169,11 +189,15 @@ ORDER BY
 	`network_data_id`,
 	`network_max_reload_time`,
 	`network_min_waiting_time`,
+	`network_max_waiting_time`,
+	`network_min_remain_budget`,
 	`network_min_remain_clicks`,
 	`network_min_payment`,
-	`network_allow_erotic`
+	`network_allow_erotic`,
+	`network_media_size`,
+	`network_media_output`
 FROM
-	`{?_MYSQL_PREFIX?}_network_types_config`
+	`{?_MYSQL_PREFIX?}_network_handler_config`
 WHERE
 	`network_id`=%s AND
 	`network_type_id`=%s
@@ -183,23 +207,23 @@ LIMIT 1',
 					bigintval($content['network_type_id'])
 				), __FUNCTION__, __LINE__);
 
-			// Do we have an entry?
+			// Is there an entry?
 			if (SQL_NUMROWS($result_config) == 1) {
 				// Load this data as well
 				$content = merge_array($content, SQL_FETCHARRAY($result_config));
 
 				// Add it with extra template
-				$content['network_type_config_content'] = loadTemplate('admin_show_config_network_type', true, $content);
+				$content['network_type_config_content'] = loadTemplate('admin_show_config_network_type', TRUE, $content);
 			} else {
 				// No configuration found, so display form
-				$content['network_type_config_content'] = loadTemplate('admin_add_config_network_type', true, $content);
+				$content['network_type_config_content'] = loadTemplate('admin_add_config_network_type', TRUE, $content);
 			}
 
 			// Free result
 			SQL_FREERESULT($result_config);
 
 			// Load row template
-			$OUT .= loadTemplate('admin_config_network_types_row', true, $content);
+			$OUT .= loadTemplate('admin_config_network_types_row', TRUE, $content);
 		} // END - while
 
 		// Prepare array for main template
@@ -209,17 +233,26 @@ LIMIT 1',
 		);
 
 		// Load main template
-		loadTemplate('admin_config_network_types', false, $content);
+		loadTemplate('admin_config_network_types', FALSE, $content);
 	} else {
 		// No entries found
-		displayMessage('{%message,ADMIN_CONFIG_NETWORK_TYPES_404=' . bigintval(getRequestElement('network_id')) . '%}');
+		displayMessage('{%message,ADMIN_CONFIG_NETWORK_HANDLER_TYPES_404=' . bigintval(getRequestElement('network_id')) . '%}');
 	}
 
 	// Free result
 	SQL_FREERESULT($result);
 } else {
 	// Generate network list for this script
-	outputHtml(generateAdminNetworkList());
+	$OUT = generateAdminNetworkList(FALSE, TRUE, FALSE);
+
+	// Is it not empty?
+	if (!empty($OUT)) {
+		// Output it
+		outputHtml($OUT);
+	} else {
+		// Nothing configured yet
+		displayMessage('{--ADMIN_NETWORK_QUERY_API_404--}');
+	}
 }
 
 // [EOF]