Moved language strings, more EL in templates

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

diff --git a/inc/modules/admin/what-list_network_api_translation.php b/inc/modules/admin/what-list_network_api_translation.php
index 3f3fa689a4b2a4048bf51fafb8886bb75edbc5da..97894cda8be4c907f37a682350834ce0920bcba2 100644 (file)
--- a/inc/modules/admin/what-list_network_api_translation.php
+++ b/inc/modules/admin/what-list_network_api_translation.php
@@ -68,21 +68,28 @@ if (isGetRequestParameterSet('network')) {
        // Get its data for template
        $networkData = getNetworkDataById(getRequestParameter('network'));
 
-       // Is a network type selected?
-       if (!isGetRequestParameterSet('network_type')) {
-               // Then present a new selection form
-               outputHtml(generateAdminNetworkTypeList(getRequestParameter('network'), getRequestParameter('network_type')));
-
-               // Abort any other processing
-               return;
-       } // END - if
+       // Init type
+       $networkData['network_type_id'] = 0;
 
        // Init disabled list
        $GLOBALS['network_translation_disabled'] = array();
 
+       // Only show params from given type handler if choosen
+       $ADD = '';
+       if ((isPostRequestParameterSet('network_type_id')) && (!is_array(postRequestParameter('network_type_id')))) {
+               // Only show from current type handler
+               $ADD = sprintf(" AND p.`network_type_id`=%s", bigintval(postRequestParameter('network_type_id')));
+
+               // Overwrite type
+               $networkData['network_type_id'] = bigintval(postRequestParameter('network_type_id'));
+
+               // Display message
+               loadTemplate('admin_settings_saved', false, '{--ADMIN_NETWORK_API_TRANSLATION_LIST_LIMITED_TO_TYPE--}');
+       } // END - if
+
        // Load all advert codes for given network
        $result = SQL_QUERY_ESC("SELECT
-       p.`network_api_id`, t.`network_type_id`, t.`network_type_handle`, p.`network_api_index`
+       p.`network_api_id`, t.`network_type_id`, t.`network_type_handle`, p.`network_api_index`, p.`sort`
 FROM
        `{?_MYSQL_PREFIX?}_network_api_translation` AS p
 INNER JOIN
@@ -90,14 +97,13 @@ INNER JOIN
 ON
        p.`network_type_id`=t.`network_type_id`
 WHERE
-       p.`network_id`=%s AND
-       p.`network_type_id`=%s
+       p.`network_id`=%s
+       ".$ADD."
 ORDER BY
        t.`network_type_handle` ASC,
        p.`network_api_id` ASC",
                array(
-                       bigintval(getRequestParameter('network')),
-                       bigintval(getRequestParameter('network_type'))
+                       bigintval(getRequestParameter('network'))
                ), __FILE__, __LINE__);
 
        // Do we have entries?
@@ -106,7 +112,7 @@ ORDER BY
                $OUT = '';
                while ($row = SQL_FETCHARRAY($result)) {
                        // Add it to network if the type matches selected
-                       if ($row['network_type_id'] == getRequestParameter('network_type_id')) {
+                       if ($row['network_type_id'] == postRequestParameter('network_type_id')) {
                                // Matches, then add it for disabling this entry
                                $GLOBALS['network_translation_disabled'][$row['network_api_index']] = true;
                        } // END - if
@@ -122,9 +128,6 @@ ORDER BY
                loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_NETWORK_API_TRANSLATION_404', $networkData['network_title']));
        }
 
-       // Add options list for network type
-       $networkData['translation_index'] = (SQL_NUMROWS($result) + 1);
-
        // Free result
        SQL_FREERESULT($result);