Mailer project continued (heavy refactoring):

[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 5a5537f16f05ab81ff97b34762dd092699463829..13ea31cdfb2c51ca05073ed78bbb95baea092cf3 100644 (file)
--- a/inc/modules/admin/what-list_network_types.php
+++ b/inc/modules/admin/what-list_network_types.php
@@ -50,13 +50,13 @@ if (doVerifyExpertSettings() != 'agreed') {
 } // END - if
 
 // 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
@@ -76,32 +76,36 @@ if (isGetRequestElementSet('network_id')) {
        `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_handler` ASC',
-               array(getRequestElement('network_id')), __FILE__, __LINE__);
+               array(bigintval(getRequestElement('network_id'))), __FILE__, __LINE__);
 
        // 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_handler']] = 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);
+                       $OUT .= loadTemplate('admin_list_network_types_row', TRUE, $row);
                } // END - while
 
+               // Generate array
+               $content = array(
+                       'rows'       => $OUT,
+                       'network_id' => bigintval(getRequestElement('network_id'))
+               );
+
                // Load main template
-               loadTemplate('admin_list_network_types', false, $OUT);
+               loadTemplate('admin_list_network_types', FALSE, $content);
        } else {
                // No entries found
                displayMessage('{%message,ADMIN_NETWORK_TYPE_HANDLER_404=' . $networkData['network_title'] . '%}');
@@ -114,7 +118,7 @@ ORDER BY
        $networkData['network_type_reload_time_unit'] = generateTimeUnitSelectionBox('h', 'network_type_reload_time_unit', array('W', 'D', 'h', 'm', 's'));
 
        // Add form for adding new types
-       loadTemplate('admin_add_network_type', false, $networkData);
+       loadTemplate('admin_add_network_type', FALSE, $networkData);
 } else {
        // Generate network list for this script
        outputHtml(generateAdminNetworkList());