Naming convention applied, ext-network menu resorted:

[mailer.git] / inc / libs / network_functions.php

diff --git a/inc/libs/network_functions.php b/inc/libs/network_functions.php
index 246e054dfc7823cfb59a8702d6445797e58ab5a0..d7d9946c235e677c4e5324ef0caa702009854e6c 100644 (file)
--- a/inc/libs/network_functions.php
+++ b/inc/libs/network_functions.php
@@ -358,12 +358,12 @@ function generateAdminNetworkList () {
        $content = '';
 
        // Query for all networks
-       $result = SQL_QUERY("SELECT
+       $result = SQL_QUERY('SELECT
        `network_id`, `network_short_name`, `network_title`
 FROM
        `{?_MYSQL_PREFIX?}_network_data`
 ORDER BY
-       `network_short_name` ASC", __FUNCTION__, __LINE__);
+       `network_short_name` ASC', __FUNCTION__, __LINE__);
 
        // Do we have entries?
        if (!SQL_HASZERONUMS($result)) {
@@ -441,7 +441,7 @@ function generateAdminDistinctNetworkTypeList () {
        $content = '';
 
        // Query all types of this network
-       $result = SQL_QUERY("SELECT
+       $result = SQL_QUERY('SELECT
        t.`network_type_id`, t.`network_type_handle`, d.`network_title`
 FROM
        `{?_MYSQL_PREFIX?}_network_types` AS t
@@ -451,7 +451,7 @@ ON
        t.`network_id`=d.`network_id`
 ORDER BY
        d.`network_short_name` ASC,
-       t.`network_type_handle` ASC", __FUNCTION__, __LINE__);
+       t.`network_type_handle` ASC', __FUNCTION__, __LINE__);
 
        // Do we have entries?
        if (!SQL_HASZERONUMS($result)) {
@@ -555,11 +555,11 @@ function generateNetworkRequestKeyOptions ($key) {
 }
 
 // Generator (somewhat getter) for (return) array translation
-function generateNetworkArrayTranslationOptions ($default) {
+function generateNetworkTranslationOptions ($default = '') {
        // Is it cached?
-       if (!isset($GLOBALS['network_array_translation'][$default])) {
+       if (!isset($GLOBALS['network_translation'][$default])) {
                // Generate and cache it
-               $GLOBALS['network_array_translation'][$default] = generateOptionList(
+               $GLOBALS['network_translation'][$default] = generateOptionList(
                        'network_translations',
                        'network_translation',
                        'network_translation',
@@ -568,13 +568,13 @@ function generateNetworkArrayTranslationOptions ($default) {
                        sprintf("WHERE `network_type_id`=%s",
                                bigintval(getRequestParameter('network_type'))
                        ),
-                       $GLOBALS['network_array_translation_disabled'],
+                       $GLOBALS['network_translation_disabled'],
                        'ADMIN_NETWORK_ARRAY_TRANSLATION_'
                );
        } // END - if
 
        // Return content
-       return $GLOBALS['network_array_translation'][$default];
+       return $GLOBALS['network_translation'][$default];
 }
 
 //------------------------------------------------------------------------------
@@ -594,10 +594,10 @@ function doAdminNetworkProcessAddnetworkForm () {
        unsetPostRequestParameter('ok');
 
        // Add the whole request to database
-       SQL_QUERY("INSERT INTO
+       SQL_QUERY('INSERT INTO
        `{?_MYSQL_PREFIX?}_network_data`
 (
-       `" . implode('`,`', array_keys(postRequestArray())) . "`
+       `' . implode('`,`', array_keys(postRequestArray())) . "`
 ) VALUES (
        '" . implode("','", array_values(postRequestArray())) . "'
 )", __FUNCTION__, __LINE__);
@@ -1103,10 +1103,10 @@ function doAdminNetworkProcessAddnetworkparamForm () {
        } // END - if
 
        // Add the whole request to database
-       SQL_QUERY("INSERT INTO
+       SQL_QUERY('INSERT INTO
        `{?_MYSQL_PREFIX?}_network_request_params`
 (
-       `" . implode('`,`', array_keys(postRequestArray())) . "`
+       `' . implode('`,`', array_keys(postRequestArray())) . "`
 ) VALUES (
        '" . implode("','", array_values(postRequestArray())) . "'
 )", __FUNCTION__, __LINE__);