Deprecated variables for templates removed, mor EL-rewrites, getMessage() rewritten:

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

diff --git a/inc/modules/admin/what-list_networks.php b/inc/modules/admin/what-list_networks.php
index 6b33104265ddb709b11e39e1b305e114016d6138..2d931e8944e44165d9255dc32163d70bc1c41ed9 100644 (file)
--- a/inc/modules/admin/what-list_networks.php
+++ b/inc/modules/admin/what-list_networks.php
@@ -18,6 +18,7 @@
  * 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                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -44,20 +45,17 @@ 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;
 
-// Was the form sent?
-if ((isFormSent()) || (isPostRequestElementSet('edit')) || (isPostRequestElementSet('del')) || (isPostRequestElementSet('change')) || (isPostRequestElementSet('remove'))) {
-       // Do we have a 'do'?
-       if (isGetRequestElementSet('do')) {
-               // Process the request
-               doAdminNetworkProcessForm();
-       } else {
-               // No 'do' found
-               loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NETWORK_DO_404'));
-       }
-} // END - if
+// Handle form here
+doNetworkHandleForm();
 
 // Display forms?
 if ($GLOBALS['network_display'] === false) {
@@ -71,14 +69,14 @@ $result = SQL_QUERY('SELECT
 FROM
        `{?_MYSQL_PREFIX?}_network_data`
 ORDER BY
-       `network_title` ASC', __FILE__, __LINE__);
+       `network_short_name` ASC', __FILE__, __LINE__);
 
 // Do we have entries?
 if (SQL_NUMROWS($result) > 0) {
        // List all
        $SW = 2; $OUT = '';
        while ($content = SQL_FETCHARRAY($result)) {
-               // Add/translate entries
+               // Add color switching
                $content['sw'] = $SW;
 
                // Load row template
@@ -92,7 +90,7 @@ if (SQL_NUMROWS($result) > 0) {
        loadTemplate('admin_list_networks', false, $OUT);
 } else {
        // Display a message that there are sponsor networks supported, yet
-       loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NETWORK_NONE_SUPPORTED'));
+       loadTemplate('admin_settings_saved', false, '{--ADMIN_NETWORK_NONE_SUPPORTED--}');
 }
 
 // Free result