Even more double->single converted

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

diff --git a/inc/modules/admin/what-config_network_types.php b/inc/modules/admin/what-config_network_types.php
index 199a7f4ab85c28e48e6f747f7f11af2d22ededc0..985f437d7ed8b6d54785b8935653bf3f300af75b 100644 (file)
--- a/inc/modules/admin/what-config_network_types.php
+++ b/inc/modules/admin/what-config_network_types.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -63,12 +63,12 @@ if (isGetRequestElementSet('network_id')) {
        // Is a network type handler selected?
        if (isGetRequestElementSet('network_type_id')) {
                // Load data for given network
-               $result = SQL_QUERY_ESC('SELECT
-       t.`network_id`,
-       t.`network_type_id`,
-       t.`network_type_handler`,
-       t.`network_type_reload_time_unit`,
-       d.`network_active`,
+               $result = sqlQueryEscaped('SELECT
+       `t`.`network_id`,
+       `t`.`network_type_id`,
+       `t`.`network_type_handler`,
+       `t`.`network_type_reload_time_unit`,
+       `d`.`network_active`,
        NULL AS `network_data_id`,
        NULL AS `network_max_reload_time`,
        NULL AS `network_min_waiting_time`,
@@ -80,14 +80,14 @@ if (isGetRequestElementSet('network_id')) {
        NULL AS `network_media_size`,
        NULL AS `network_media_output`
 FROM
-       `{?_MYSQL_PREFIX?}_network_types` AS t
+       `{?_MYSQL_PREFIX?}_network_types` AS `t`
 INNER JOIN
-       `{?_MYSQL_PREFIX?}_network_data` AS d
+       `{?_MYSQL_PREFIX?}_network_data` AS `d`
 ON
        d.network_id=t.network_id
 WHERE
-       t.`network_id`=%s AND
-       t.`network_type_id`=%s
+       `t`.`network_id`=%s AND
+       `t`.`network_type_id`=%s
 LIMIT 1',
                        array(
                                bigintval(getRequestElement('network_id')),
@@ -95,9 +95,9 @@ LIMIT 1',
                        ), __FUNCTION__, __LINE__);
 
                // Is there a record?
-               if (SQL_NUMROWS($result) == 1) {
+               if (sqlNumRows($result) == 1) {
                        // Load it
-                       $content = SQL_FETCHARRAY($result);
+                       $content = sqlFetchArray($result);
 
                        // Is the network active?
                        if (($content['network_active'] == 'N') && (!isAdminsExpertWarningEnabled()) && (!isDebugModeEnabled())) {
@@ -107,7 +107,7 @@ LIMIT 1',
                        } // END - if
 
                        // Check for network type configuration
-                       $result_config = SQL_QUERY_ESC('SELECT
+                       $result_config = sqlQueryEscaped('SELECT
        `network_data_id`,
        `network_max_reload_time`,
        `network_min_waiting_time`,
@@ -133,16 +133,16 @@ LIMIT 1',
                        $templateName = 'admin_add_config_network_type_form';
 
                        // Do we also have configuration?
-                       if (SQL_NUMROWS($result_config) == 1) {
+                       if (sqlNumRows($result_config) == 1) {
                                // Load as well and merge it
-                               $content = merge_array($content, SQL_FETCHARRAY($result_config));
+                               $content = merge_array($content, sqlFetchArray($result_config));
 
                                // Use template for editing
                                $templateName = 'admin_edit_config_network_type_form';
                        } // END - if
 
                        // Free result
-                       SQL_FREERESULT($result_config);
+                       sqlFreeResult($result_config);
 
                        // "Translate" some values
                        $content['network_max_reload_time']  = createTimeSelections($content['network_max_reload_time'], 'network_max_reload_time', 'WDhms');
@@ -158,11 +158,11 @@ LIMIT 1',
                } // END - if
 
                // Free result
-               SQL_FREERESULT($result);
+               sqlFreeResult($result);
        } // END - if
 
        // Get all type handlers
-       $result = SQL_QUERY_ESC('SELECT
+       $result = sqlQueryEscaped('SELECT
        `network_id`,
        `network_type_id`,
        `network_type_handler`,
@@ -178,14 +178,14 @@ ORDER BY
                ), __FUNCTION__, __LINE__);
 
        // Are there entries left?
-       if (!SQL_HASZERONUMS($result)) {
+       if (!ifSqlHasZeroNums($result)) {
                // Init row output
                $OUT = '';
 
                // List all entries
-               while ($content = SQL_FETCHARRAY($result)) {
+               while ($content = sqlFetchArray($result)) {
                        // Check if config entry is there
-                       $result_config = SQL_QUERY_ESC('SELECT
+                       $result_config = sqlQueryEscaped('SELECT
        `network_data_id`,
        `network_max_reload_time`,
        `network_min_waiting_time`,
@@ -208,9 +208,9 @@ LIMIT 1',
                                ), __FUNCTION__, __LINE__);
 
                        // Is there an entry?
-                       if (SQL_NUMROWS($result_config) == 1) {
+                       if (sqlNumRows($result_config) == 1) {
                                // Load this data as well
-                               $content = merge_array($content, SQL_FETCHARRAY($result_config));
+                               $content = merge_array($content, sqlFetchArray($result_config));
 
                                // Add it with extra template
                                $content['network_type_config_content'] = loadTemplate('admin_show_config_network_type', TRUE, $content);
@@ -220,7 +220,7 @@ LIMIT 1',
                        }
 
                        // Free result
-                       SQL_FREERESULT($result_config);
+                       sqlFreeResult($result_config);
 
                        // Load row template
                        $OUT .= loadTemplate('admin_config_network_types_row', TRUE, $content);
@@ -240,7 +240,7 @@ LIMIT 1',
        }
 
        // Free result
-       SQL_FREERESULT($result);
+       sqlFreeResult($result);
 } else {
        // Generate network list for this script
        $OUT = generateAdminNetworkList(FALSE, TRUE, FALSE);