Extension ext-network continued:

[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 01800dc75f0468fdf1c42a404f61993d2b7f17ea..fd4efcfe2ca03f6fbd71774c24e51243ad623eb5 100644 (file)
--- a/inc/modules/admin/what-config_network_types.php
+++ b/inc/modules/admin/what-config_network_types.php
@@ -64,10 +64,11 @@ 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`,
@@ -75,10 +76,14 @@ if (isGetRequestElementSet('network_id')) {
        NULL AS `network_min_payment`,
        NULL AS `network_allow_erotic`
 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')),
@@ -90,6 +95,13 @@ LIMIT 1',
                        // Load it
                        $content = SQL_FETCHARRAY($result);
 
+                       // Is the network active?
+                       if ($content['network_active'] == 'N') {
+                               // Not active
+                               displayMessage('{--ADMIN_NETWORK_NOT_ACTIVE--}');
+                               return;
+                       } // END - if
+
                        // Check for network type configuration
                        $result_config = SQL_QUERY_ESC('SELECT
        `network_data_id`,
@@ -134,7 +146,7 @@ LIMIT 1',
                        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,14 +157,14 @@ 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__);
@@ -212,7 +224,7 @@ LIMIT 1',
                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