Also this old column name is back ...

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

diff --git a/inc/modules/admin/what-list_network_array_translation.php b/inc/modules/admin/what-list_network_array_translation.php
index 4b7a3734d3582d2b35b985e2aafe19b8094dd846..fe4c5c33b0589a0317c74c1057b473f41cc736ed 100644 (file)
--- a/inc/modules/admin/what-list_network_array_translation.php
+++ b/inc/modules/admin/what-list_network_array_translation.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 *
@@ -50,18 +50,18 @@ 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
 
-// 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'));
@@ -70,7 +70,7 @@ if (isGetRequestElementSet('network_id')) {
        $networkData['network_type_id'] = 0;
 
        // Init disabled list
-       $GLOBALS['network_translation_disabled'] = array();
+       $GLOBALS['network_array_translation_disabled'] = array();
 
        // Only show params from given type handler if choosen
        $ADD = '';
@@ -91,7 +91,7 @@ if (isGetRequestElementSet('network_id')) {
        t.`network_type_id`,
        t.`network_type_handler`,
        p.`network_array_index`,
-       p.`sort`
+       p.`network_array_sort`
 FROM
        `{?_MYSQL_PREFIX?}_network_array_translation` AS p
 INNER JOIN
@@ -108,7 +108,7 @@ ORDER BY
                        bigintval(getRequestElement('network_id'))
                ), __FILE__, __LINE__);
 
-       // Do we have entries?
+       // Are there entries?
        if (!SQL_HASZERONUMS($result)) {
                // List all entries
                $OUT = '';
@@ -116,15 +116,21 @@ ORDER BY
                        // Add it to network if the type matches selected
                        if ($row['network_type_id'] == postRequestElement('network_type_id')) {
                                // Matches, then add it for disabling this entry
-                               $GLOBALS['network_translation_disabled'][$row['network_array_index']] = true;
+                               $GLOBALS['network_array_translation_disabled'][$row['network_array_index']] = TRUE;
                        } // END - if
 
                        // Add row template and switch color
-                       $OUT .= loadTemplate('admin_list_network_array_translation_row', true, $row);
+                       $OUT .= loadTemplate('admin_list_network_array_translation_row', TRUE, $row);
                } // END - while
 
+               // Prepare array with generic elements
+               $content = array(
+                       'rows'       => $OUT,
+                       'network_id' => bigintval(getRequestElement('network_id'))
+               );
+
                // Load main template
-               loadTemplate('admin_list_network_array_translation', false, $OUT);
+               loadTemplate('admin_list_network_array_translation', FALSE, $content);
        } else {
                // No entries found
                displayMessage('{%message,ADMIN_NETWORK_ARRAY_TRANSLATION_404=' . $networkData['network_title'] . '%}');
@@ -134,7 +140,7 @@ ORDER BY
        SQL_FREERESULT($result);
 
        // Add form for adding new array_translation pair
-       loadTemplate('admin_add_network_array_translation', false, $networkData);
+       loadTemplate('admin_add_network_array_translation', FALSE, $networkData);
 } else {
        // Generate network list for this script
        outputHtml(generateAdminNetworkList());