Bug 'return is not bool' fixed

[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 cf204b7f7fc16071783fe6e1dd034dc22774d4e1..59d3e7530c884ef3f21544aafde335d52800fa80 100644 (file)
--- a/inc/modules/admin/what-list_network_types.php
+++ b/inc/modules/admin/what-list_network_types.php
@@ -63,9 +63,12 @@ if ($GLOBALS['network_display'] === false) {
 } // 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'));
+
+       // Init disabled list
+       $networkData['disabled'] = array();
 
        // Load all advert types for given network
        $result = SQL_QUERY_ESC("SELECT
@@ -76,7 +79,7 @@ WHERE
        `network_id`=%s
 ORDER BY
        `network_type_handle` ASC",
-               array(getRequestElement('network')), __FILE__, __LINE__);
+               array(getRequestParameter('network')), __FILE__, __LINE__);
 
        // Do we have entries?
        if (SQL_NUMROWS($result) > 0) {
@@ -87,6 +90,9 @@ ORDER BY
                        $row['sw'] = $SW;
                        if (trim($row['network_type_banner_url']) == '') $row['network_type_banner_url'] = '---';
 
+                       // Set disabled entry
+                       $networkData['disabled'][$row['network_type_handle']] = true;
+
                        // Add row template and switch color
                        $OUT .= loadTemplate('admin_list_network_types_row', true, $row);
                        $SW = 3 - $SW;
@@ -95,7 +101,7 @@ ORDER BY
                // Prepare data for template
                $content = array(
                        'rows'            => $OUT,
-                       'network_id'      => getRequestElement('network'),
+                       'network_id'      => getRequestParameter('network'),
                        'network_title'   => $networkData['network_title'],
                        'network_reflink' => $networkData['network_reflink'],
                );
@@ -110,6 +116,73 @@ ORDER BY
        // Free result
        SQL_FREERESULT($result);
 
+       // Add type option list
+       $networkData['type_options'] = generateOptionList(
+               '/ARRAY/',
+               array(
+                       'banner',
+                       'banner_click',
+                       'banner_view',
+                       'button',
+                       'button_click',
+                       'button_view',
+                       'surfbar',
+                       'surfbar_click',
+                       'surfbar_view',
+                       'focredbanner',
+                       'forcedtextlink',
+                       'textlink',
+                       'textlink_click',
+                       'textlink_view',
+                       'skybanner',
+                       'skybanner_click',
+                       'skybanner_view',
+                       'layer',
+                       'layer_click',
+                       'layer_view',
+                       'popup',
+                       'popdown',
+                       'textmail',
+                       'htmlmail',
+                       'lead',
+                       'sale',
+                       'payperactive',
+                       'pagepeel'
+               ),
+               array(
+                       '{--ADMIN_NETWORK_TYPES_BANNER_CLICK_VIEW--}',
+                       '{--ADMIN_NETWORK_TYPES_BANNER_CLICK--}',
+                       '{--ADMIN_NETWORK_TYPES_BANNER_VIEW--}',
+                       '{--ADMIN_NETWORK_TYPES_BUTTON_CLICK_VIEW--}',
+                       '{--ADMIN_NETWORK_TYPES_BUTTON_CLICK--}',
+                       '{--ADMIN_NETWORK_TYPES_BUTTON_VIEW--}',
+                       '{--ADMIN_NETWORK_TYPES_SURFBAR_CLICK_VIEW--}',
+                       '{--ADMIN_NETWORK_TYPES_SURFBAR_CLICK--}',
+                       '{--ADMIN_NETWORK_TYPES_SURFBAR_VIEW--}',
+                       '{--ADMIN_NETWORK_TYPES_FORCED_BANNER--}',
+                       '{--ADMIN_NETWORK_TYPES_FORCED_TEXTLINK--}',
+                       '{--ADMIN_NETWORK_TYPES_TEXTLINK_CLICK_VIEW--}',
+                       '{--ADMIN_NETWORK_TYPES_TEXTLINK_CLICK--}',
+                       '{--ADMIN_NETWORK_TYPES_TEXTLINK_VIEW--}',
+                       '{--ADMIN_NETWORK_TYPES_SKYBANNER_CLICK_VIEW--}',
+                       '{--ADMIN_NETWORK_TYPES_SKYBANNER_CLICK--}',
+                       '{--ADMIN_NETWORK_TYPES_SKYBANNER_VIEW--}',
+                       '{--ADMIN_NETWORK_TYPES_LAYER_CLICK_VIEW--}',
+                       '{--ADMIN_NETWORK_TYPES_LAYER_CLICK--}',
+                       '{--ADMIN_NETWORK_TYPES_LAYER_VIEW--}',
+                       '{--ADMIN_NETWORK_TYPES_POPUP--}',
+                       '{--ADMIN_NETWORK_TYPES_POPDOWN--}',
+                       '{--ADMIN_NETWORK_TYPES_TEXTMAIL--}',
+                       '{--ADMIN_NETWORK_TYPES_HTMLMAIL--}',
+                       '{--ADMIN_NETWORK_TYPES_LEAD--}',
+                       '{--ADMIN_NETWORK_TYPES_SALE--}',
+                       '{--ADMIN_NETWORK_TYPES_PAYPERACTIVE--}',
+                       '{--ADMIN_NETWORK_TYPES_PAGEPEEL--}'
+               ),
+               '', '', '',
+               $networkData['disabled']
+       );
+
        // Add form for adding new types
        loadTemplate('admin_add_network_type', false, $networkData);
 } else {