Mailer project continued:

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

diff --git a/inc/modules/admin/what-list_network_types.php b/inc/modules/admin/what-list_network_types.php
index 4b5dbe21be8e20f5c1d0cbcf5e9673dbbf48f896..bb15cf56cbefd4af4de1c7745a25468f3a52d205 100644 (file)
--- a/inc/modules/admin/what-list_network_types.php
+++ b/inc/modules/admin/what-list_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 *
@@ -61,7 +61,7 @@ if ($GLOBALS['network_display'] === false) {
        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'));
@@ -72,29 +72,27 @@ if (isGetRequestElementSet('network_id')) {
        // Load all advert types for given network
        $result = SQL_QUERY_ESC('SELECT
        `network_type_id`,
-       `network_type_handle`,
+       `network_type_handler`,
        `network_type_api_url`,
        `network_type_click_url`,
        `network_type_banner_url`,
-       `network_type_reload_time_unit`
+       `network_type_reload_time_unit`,
+       `network_text_encoding`
 FROM
        `{?_MYSQL_PREFIX?}_network_types`
 WHERE
        `network_id`=%s
 ORDER BY
-       `network_type_handle` ASC',
+       `network_type_handler` ASC',
                array(getRequestElement('network_id')), __FILE__, __LINE__);
 
-       // Do we have entries?
+       // Are there entries?
        if (!SQL_HASZERONUMS($result)) {
                // List all entries
                $OUT = '';
                while ($row = SQL_FETCHARRAY($result)) {
-                       // Add/translate some data
-                       $row['network_type_banner_url'] = fixNullEmptyToDashes($row['network_type_banner_url'], 3);
-
                        // Set disabled entry
-                       $GLOBALS['network_types_disabled'][$row['network_type_handle']] = true;
+                       $GLOBALS['network_types_disabled'][$row['network_type_handler']] = true;
 
                        // Add row template and switch color
                        $OUT .= loadTemplate('admin_list_network_types_row', true, $row);
@@ -104,7 +102,7 @@ ORDER BY
                loadTemplate('admin_list_network_types', false, $OUT);
        } else {
                // No entries found
-               displayMessage('{%message,ADMIN_NETWORK_TYPES_404=' . $networkData['network_title'] . '%}');
+               displayMessage('{%message,ADMIN_NETWORK_TYPE_HANDLER_404=' . $networkData['network_title'] . '%}');
        }
 
        // Free result