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

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

diff --git a/inc/modules/admin/what-adminedit.php b/inc/modules/admin/what-adminedit.php
index 70448b0315556cd71a55b624d41fb7485aadd186..d41753b54a28f9dd80acb36d904f4ea646f98267 100644 (file)
--- a/inc/modules/admin/what-adminedit.php
+++ b/inc/modules/admin/what-adminedit.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 *
@@ -52,7 +53,7 @@ if (isGetRequestParameterSet('sub')) {
 } // END - if
 
 // List all menu points and make them editable
-if ((isPostRequestParameterSet('edit')) && (countPostSelection() > 0) && (!isDemoModeActive())) {
+if ((isFormSent('edit')l) && (countPostSelection() > 0) && (!isDemoModeActive())) {
        // Edit menu entries
        // @TODO Kill all constants in this file
        $content['sub'] = $SUB;
@@ -102,7 +103,7 @@ if ((isPostRequestParameterSet('edit')) && (countPostSelection() > 0) && (!isDem
 
        // Load template
        loadTemplate('admin_amenu_edit_form', false, $content);
-} elseif ((isPostRequestParameterSet('del')) && (countPostSelection() > 0) && (!isDemoModeActive())) {
+} elseif ((isFormSent('del')) && (countPostSelection() > 0) && (!isDemoModeActive())) {
        // Prepare misc content
        $content['sub'] = $SUB;
        $content['chk'] = countPostSelection();
@@ -168,7 +169,7 @@ WHERE ".$AND." AND `id`=%s LIMIT 1",
                        }
 
                        // Load template
-                       loadTemplate('admin_settings_saved', false, getMessage('SETTINGS_SAVED'));
+                       loadTemplate('admin_settings_saved', false, '{--SETTINGS_SAVED--}');
                        break;
 
                case 'del': // Delete menu
@@ -178,7 +179,7 @@ WHERE ".$AND." AND `id`=%s LIMIT 1",
                        } // END - foreach
 
                        // Load template
-                       loadTemplate('admin_settings_saved', false, getMessage('SETTINGS_SAVED'));
+                       loadTemplate('admin_settings_saved', false, '{--SETTINGS_SAVED--}');
                        break;
 
                default: // Unexpected action
@@ -280,7 +281,7 @@ WHERE ".$AND." AND `id`=%s LIMIT 1",
                loadTemplate('admin_amenu_edit', false, $content);
        } else {
                // Menu entries are missing... (???)
-               loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NO_MENUS_FOUND'));
+               loadTemplate('admin_settings_saved', false, '{--ADMIN_NO_MENUS_FOUND--}');
        }
 }