Use rebuildCache() instead of loadCacheFile()/removeCacheFile()

[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 506804755fc7ed05d8d5e10d4d7684713ceea3c2..b53daf2770bb6f8df95225fe1e472ab08be6237b 100644 (file)
--- a/inc/modules/admin/what-list_network_array_translation.php
+++ b/inc/modules/admin/what-list_network_array_translation.php
@@ -64,7 +64,7 @@ if ($GLOBALS['network_display'] === FALSE) {
 // Is there a network selected?
 if (isGetRequestElementSet('network_id')) {
        // Get its data for template
-       $networkData = getNetworkDataById(getRequestElement('network_id'));
+       $networkData = getNetworkDataFromId(getRequestElement('network_id'));
 
        // Init type
        $networkData['network_type_id'] = 0;
@@ -76,7 +76,7 @@ if (isGetRequestElementSet('network_id')) {
        $ADD = '';
        if ((isPostRequestElementSet('network_type_id')) && (!is_array(postRequestElement('network_type_id')))) {
                // Only show from current type handler
-               $ADD = sprintf(" AND p.`network_type_id`=%s", bigintval(postRequestElement('network_type_id')));
+               $ADD = sprintf(" AND `p`.`network_type_id`=%s", bigintval(postRequestElement('network_type_id')));
 
                // Overwrite type
                $networkData['network_type_id'] = bigintval(postRequestElement('network_type_id'));
@@ -87,23 +87,23 @@ if (isGetRequestElementSet('network_id')) {
 
        // Load all advert codes for given network
        $result = SQL_QUERY_ESC("SELECT
-       p.`network_array_id`,
-       t.`network_type_id`,
-       t.`network_type_handler`,
-       p.`network_array_index`,
-       p.`network_array_sort`
+       `p`.`network_array_id`,
+       `t`.`network_type_id`,
+       `t`.`network_type_handler`,
+       `p`.`network_array_index`,
+       `p`.`network_array_sort`
 FROM
-       `{?_MYSQL_PREFIX?}_network_array_translation` AS p
+       `{?_MYSQL_PREFIX?}_network_array_translation` AS `p`
 INNER JOIN
-       `{?_MYSQL_PREFIX?}_network_types` AS t
+       `{?_MYSQL_PREFIX?}_network_types` AS `t`
 ON
-       p.`network_type_id`=t.`network_type_id`
+       `p`.`network_type_id`=`t`.`network_type_id`
 WHERE
-       p.`network_id`=%s
+       `p`.`network_id`=%s
        ".$ADD."
 ORDER BY
-       t.`network_type_handler` ASC,
-       p.`network_array_id` ASC",
+       `t`.`network_type_handler` ASC,
+       `p`.`network_array_sort` ASC",
                array(
                        bigintval(getRequestElement('network_id'))
                ), __FILE__, __LINE__);
@@ -123,8 +123,14 @@ ORDER BY
                        $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'] . '%}');
@@ -137,7 +143,13 @@ ORDER BY
        loadTemplate('admin_add_network_array_translation', FALSE, $networkData);
 } else {
        // Generate network list for this script
-       outputHtml(generateAdminNetworkList());
+       $OUT = generateAdminNetworkList();
+
+       // Is it not empty?
+       if (!empty($OUT)) {
+               // Output it
+               outputHtml($OUT);
+       } // END - if
 }
 
 // [EOF]