Mailer project rwritten:

[mailer.git] / inc / modules / admin / what-config_network_types.php

diff --git a/inc/modules/admin/what-config_network_types.php b/inc/modules/admin/what-config_network_types.php
index 671e5599a91222c30bbea532d0fb331173c4316b..199a7f4ab85c28e48e6f747f7f11af2d22ededc0 100644 (file)
--- a/inc/modules/admin/what-config_network_types.php
+++ b/inc/modules/admin/what-config_network_types.php
@@ -72,9 +72,13 @@ if (isGetRequestElementSet('network_id')) {
        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` AS t
 INNER JOIN
@@ -96,7 +100,7 @@ LIMIT 1',
                        $content = SQL_FETCHARRAY($result);
 
                        // Is the network active?
-                       if ($content['network_active'] == 'N') {
+                       if (($content['network_active'] == 'N') && (!isAdminsExpertWarningEnabled()) && (!isDebugModeEnabled())) {
                                // Not active
                                displayMessage('{--ADMIN_NETWORK_NOT_ACTIVE--}');
                                return;
@@ -107,11 +111,15 @@ LIMIT 1',
        `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
@@ -181,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
@@ -231,7 +243,16 @@ LIMIT 1',
        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]