Fixes and cleanups

[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 9aa4f31216ba2c89db85910fb67a4aea875190ba..4e3cf4297c4e840c173483955633adf0c1559598 100644 (file)
--- a/inc/modules/admin/what-list_network_types.php
+++ b/inc/modules/admin/what-list_network_types.php
@@ -14,12 +14,10 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -43,7 +41,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 } // END - if
 
 // Add description as navigation point
-addMenuDescription('admin', __FILE__);
+addYouAreHereLink('admin', __FILE__);
 
 // These are expert settings!
 if (doVerifyExpertSettings() != 'agreed') {
@@ -64,23 +62,23 @@ if ($GLOBALS['network_display'] === false) {
 } // END - if
 
 // Do we have a network selected?
-if (isGetRequestParameterSet('network')) {
+if (isGetRequestElementSet('network')) {
        // Get its data for template
-       $networkData = getNetworkDataById(getRequestParameter('network'));
+       $networkData = getNetworkDataById(getRequestElement('network'));
 
        // Init disabled list
-       $networkData['disabled'] = array();
+       $GLOBALS['network_types_disabled'] = array();
 
        // Load all advert types for given network
        $result = SQL_QUERY_ESC("SELECT
-       `network_type_id`, `network_type_handle`, `network_type_api_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_handle` ASC",
-               array(getRequestParameter('network')), __FILE__, __LINE__);
+               array(getRequestElement('network')), __FILE__, __LINE__);
 
        // Do we have entries?
        if (!SQL_HASZERONUMS($result)) {
@@ -91,7 +89,7 @@ ORDER BY
                        $row['network_type_banner_url'] = fixNullEmptyToDashes($row['network_type_banner_url'], 3);
 
                        // Set disabled entry
-                       $networkData['disabled'][$row['network_type_handle']] = true;
+                       $GLOBALS['network_types_disabled'][$row['network_type_handle']] = true;
 
                        // Add row template and switch color
                        $OUT .= loadTemplate('admin_list_network_types_row', true, $row);
@@ -101,52 +99,12 @@ ORDER BY
                loadTemplate('admin_list_network_types', false, $OUT);
        } else {
                // No entries found
-               loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_NETWORK_TYPES_404', $networkData['network_title']));
+               displayMessage('{%message,ADMIN_NETWORK_TYPES_404=' . $networkData['network_title'] . '%}');
        }
 
        // 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',
-                       'forcedbanner',
-                       'forcedtextlink',
-                       'textlink',
-                       'textlink_click',
-                       'textlink_view',
-                       'skybanner',
-                       'skybanner_click',
-                       'skybanner_view',
-                       'layer',
-                       'layer_click',
-                       'layer_view',
-                       'popup',
-                       'popdown',
-                       'textmail',
-                       'htmlmail',
-                       'lead',
-                       'sale',
-                       'payperactive',
-                       'pagepeel',
-                       'traffic'
-               ),
-               array(),
-               '', '', '',
-               $networkData['disabled'],
-               'translateNetworkTypeHandler'
-       );
-
        // Add form for adding new types
        loadTemplate('admin_add_network_type', false, $networkData);
 } else {