introduced isSqlResult() which encapsulates checking MySQL/i results

[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 1857f48a2edbc7c61273467ea10c79a4be4ddc54..1ef12fe8096c0d2526a85534f1a1a0c07b3713ea 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 - 2012 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2016 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -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
@@ -64,19 +64,19 @@ 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;
 
        // Init disabled list
-       $GLOBALS['network_translation_disabled'] = array();
+       $GLOBALS['network_array_translation_disabled'] = array();
 
        // Only show params from given type handler if choosen
        $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'));
@@ -86,58 +86,70 @@ if (isGetRequestElementSet('network_id')) {
        } // END - if
 
        // 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.`sort`
+       $result = sqlQueryEscaped('SELECT
+       `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
-       ".$ADD."
+       `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__);
 
        // Are there entries?
-       if (!SQL_HASZERONUMS($result)) {
+       if (!ifSqlHasZeroNumRows($result)) {
                // List all entries
                $OUT = '';
-               while ($row = SQL_FETCHARRAY($result)) {
+               while ($row = sqlFetchArray($result)) {
                        // 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'] . '%}');
        }
 
        // Free result
-       SQL_FREERESULT($result);
+       sqlFreeResult($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());
+       $OUT = generateAdminNetworkList();
+
+       // Is it not empty?
+       if (!empty($OUT)) {
+               // Output it
+               outputHtml($OUT);
+       } // END - if
 }
 
 // [EOF]