'what','action','module' and 'output_mode' wrapped into functions (WARNUNG: Code...

[mailer.git] / inc / modules / admin.php

diff --git a/inc/modules/admin.php b/inc/modules/admin.php
index da1be6a77cef86a5d8e50500446d2070bee27e83..cb120546621b44250fd204d9859466ba1d4e90ad 100644 (file)
--- a/inc/modules/admin.php
+++ b/inc/modules/admin.php
@@ -222,13 +222,13 @@ if (!isAdminRegistered()) {
                                $URL = 'modules.php?module=admin&';
 
                                // Rewrite overview module
-                               if ($GLOBALS['what'] == 'overview') {
-                                       $GLOBALS['action'] = getModeAction($GLOBALS['module'], $GLOBALS['what']);
+                               if (getWhat() == 'overview') {
+                                       setAction(getModeAction(getModule(), getWhat()));
                                } // END - if
 
                                // Add data to URL
-                               if (!empty($GLOBALS['what']))        $URL .= 'what='.$GLOBALS['what'];
-                                elseif (!empty($GLOBALS['action'])) $URL .= 'action='.$GLOBALS['action'];
+                               if (isWhatSet())        $URL .= 'what='.getWhat();
+                                elseif (isActionSet()) $URL .= 'action='.getAction();
                                 elseif (REQUEST_ISSET_GET('area'))  $URL .= 'area='.REQUEST_GET('area');
 
                         // Load URL
@@ -295,13 +295,13 @@ if (!isAdminRegistered()) {
                }
 
                // Load login form
-               if (!empty($GLOBALS['what'])) {
+               if (isWhatSet()) {
                        // Restore old what value
-                       $content = array('target' => 'what', 'value' => $GLOBALS['what']);
-               } elseif (!empty($GLOBALS['action'])) {
-                       if ($GLOBALS['action'] != 'logout') {
+                       $content = array('target' => 'what', 'value' => getWhat());
+               } elseif (isActionSet()) {
+                       if (getAction() != 'logout') {
                                // Restore old action value
-                               $content = array('target' => 'action', 'value' => $GLOBALS['action']);
+                               $content = array('target' => 'action', 'value' => getAction());
                        } else {
                                // Set default values
                                $content = array('target' => 'action', 'value' => 'login');
@@ -368,11 +368,11 @@ if (!isAdminRegistered()) {
                                loadIncludeOnce('inc/modules/admin/lasys-inc.php');
 
                                // Create new-style menu system will logical areas
-                               ADMIN_LOGICAL_AREA_SYSTEM($area, $act, $GLOBALS['what']);
+                               ADMIN_LOGICAL_AREA_SYSTEM($area, $act, getWhat());
                        } else {
                                // This little call constructs the whole default old and lacky menu system
                                // on left side. It also renders the content on right side
-                               ADMIN_DO_ACTION($GLOBALS['what']);
+                               ADMIN_DO_ACTION(getWhat());
                        }
                        break;