fooRequestElementBar() functions renamed, adding of request parameters added:

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

diff --git a/inc/modules/admin/what-list_network_types.php b/inc/modules/admin/what-list_network_types.php
index 41daad94639679d84718774046ca5e6653beda3c..1542f10b2293dce30214e37f6861728722113169 100644 (file)
--- a/inc/modules/admin/what-list_network_types.php
+++ b/inc/modules/admin/what-list_network_types.php
@@ -44,24 +44,39 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 // Add description as navigation point
 addMenuDescription('admin', __FILE__);
 
+// These are expert settings!
+if (doVerifyExpertSettings() != 'agreed') {
+       // Abort here
+       return;
+} // END - if
+
+// By default we should display list/add new forms
+$GLOBALS['network_display'] = true;
+
 // Handle form here
 doNetworkHandleForm();
 
+// Display forms?
+if ($GLOBALS['network_display'] === false) {
+       // Abort here
+       return;
+} // END - if
+
 // Do we have a network selected?
-if (isGetRequestElementSet('network')) {
+if (isGetRequestParameterSet('network')) {
        // Get its data for template
-       $networkData = getNetworkDataById(getRequestElement('network'));
+       $networkData = getNetworkDataById(getRequestParameter('network'));
 
        // Load all advert types for given network
        $result = SQL_QUERY_ESC("SELECT
-       `network_type_id`, `network_type_handle`, `network_type_request_url`, `network_type_click_url`, `network_type_banner_url`
+       `network_type_id`, `network_type_handle`, `network_type_api_url`, `network_type_click_url`, `network_type_banner_url`
 FROM
        `{?_MYSQL_PREFIX?}_network_types`
 WHERE
        `network_id`=%s
 ORDER BY
-       `network_type_id` ASC",
-               array(getRequestElement('network')), __FILE__, __LINE__);
+       `network_type_handle` ASC",
+               array(getRequestParameter('network')), __FILE__, __LINE__);
 
        // Do we have entries?
        if (SQL_NUMROWS($result) > 0) {
@@ -70,17 +85,26 @@ ORDER BY
                while ($row = SQL_FETCHARRAY($result)) {
                        // Add/translate some data
                        $row['sw'] = $SW;
+                       if (trim($row['network_type_banner_url']) == '') $row['network_type_banner_url'] = '---';
 
                        // Add row template and switch color
                        $OUT .= loadTemplate('admin_list_network_types_row', true, $row);
                        $SW = 3 - $SW;
                } // END - while
 
+               // Prepare data for template
+               $content = array(
+                       'rows'            => $OUT,
+                       'network_id'      => getRequestParameter('network'),
+                       'network_title'   => $networkData['network_title'],
+                       'network_reflink' => $networkData['network_reflink'],
+               );
+
                // Load main template
-               loadTemplate('admin_list_network_types', false, $OUT);
+               loadTemplate('admin_list_network_types', false, $content);
        } else {
                // No entries found
-               loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_NETWORK_TYPES_404'), $networkData['network_title']));
+               loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_NETWORK_TYPES_404', $networkData['network_title']));
        }
 
        // Free result