More misc fixes and rewrites (sorry, lame description)

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

diff --git a/inc/modules/admin.php b/inc/modules/admin.php
index da1be6a77cef86a5d8e50500446d2070bee27e83..3b196b40d1292cfb5bd02c4c70e68012d70586b1 100644 (file)
--- a/inc/modules/admin.php
+++ b/inc/modules/admin.php
@@ -54,7 +54,7 @@ $ret = 'init';
 // Is no admin registered?
 if (!isAdminRegistered()) {
        // Admin is not registered so we have to inform the user
-       if ((isFormSent()) && ((!REQUEST_ISSET_POST('login')) || (!REQUEST_ISSET_POST(('pass'))) || (strlen(REQUEST_POST('pass')) < 4))) {
+       if ((isFormSent()) && ((!REQUEST_ISSET_POST('login')) || (!REQUEST_ISSET_POST('pass')) || (strlen(REQUEST_POST('pass')) < 4))) {
                REQUEST_SET_POST('ok', '***');
        } // END - if
 
@@ -126,7 +126,7 @@ if (!isAdminRegistered()) {
                        if (!empty($ret)) $loginMessage = $ret;
 
                        // No password entered?
-                       if (!REQUEST_ISSET_POST(('pass'))) $passwdMessage = getMessage('ADMIN_NO_PASS');
+                       if (!REQUEST_ISSET_POST('pass')) $passwdMessage = getMessage('ADMIN_NO_PASS');
 
                        // Or password too short?
                        if (strlen(REQUEST_POST('pass')) < 4) $passwdMessage = getMessage('ADMIN_SHORT_PASS');
@@ -178,7 +178,7 @@ if (!isAdminRegistered()) {
                        // Cannot validate the login data and hash
                        LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED'));
                }
-       } elseif ((REQUEST_ISSET_POST('reset_pass')) && (REQUEST_ISSET_POST('hash')) && (REQUEST_ISSET_POST('login')) && (REQUEST_ISSET_POST(('pass1'))) && (REQUEST_POST('pass1') == REQUEST_POST('pass2'))) {
+       } elseif ((REQUEST_ISSET_POST('reset_pass')) && (REQUEST_ISSET_POST('hash')) && (REQUEST_ISSET_POST('login')) && (REQUEST_ISSET_POST('pass1')) && (REQUEST_POST('pass1') == REQUEST_POST('pass2'))) {
                // Okay, we shall the admin password here. So first revalidate the hash
                if (ADMIN_VALIDATE_RESET_LINK_HASH_LOGIN(REQUEST_POST('hash'), REQUEST_POST('login'))) {
                        // Set the password now
@@ -201,13 +201,13 @@ if (!isAdminRegistered()) {
                redirectToUrl('modules.php?module=admin&amp;logout=1');
        } // END - if
 
-       if (REQUEST_ISSET_GET(('register'))) {
+       if (REQUEST_ISSET_GET('register')) {
                // Registration of first admin is done
                if (REQUEST_GET('register') == 'done') LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_REGISTER_DONE'));
        } // END - if
 
        // Check if the admin has submitted data or not
-       if ((isFormSent()) && ((!REQUEST_ISSET_POST('login')) || (!REQUEST_ISSET_POST(('pass'))) || (strlen(REQUEST_POST('pass')) < 4))) {
+       if ((isFormSent()) && ((!REQUEST_ISSET_POST('login')) || (!REQUEST_ISSET_POST('pass')) || (strlen(REQUEST_POST('pass')) < 4))) {
                REQUEST_SET_POST('ok', '***');
        } // END - if
 
@@ -222,13 +222,13 @@ if (!isAdminRegistered()) {
                                $URL = 'modules.php?module=admin&amp;';
 
                                // 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
@@ -273,7 +273,7 @@ if (!isAdminRegistered()) {
                        if ((!empty($ret)) && (REQUEST_POST('ok') == '404')) $loginMessage = $ret;
 
                        // No password entered?
-                       if (!REQUEST_ISSET_POST(('pass'))) $passwdMessage = getMessage('ADMIN_NO_PASS');
+                       if (!REQUEST_ISSET_POST('pass')) $passwdMessage = getMessage('ADMIN_NO_PASS');
 
                        // Or password too short?
                        if (strlen(REQUEST_POST('pass')) < 4) $passwdMessage = getMessage('ADMIN_SHORT_PASS');
@@ -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');
@@ -317,13 +317,13 @@ if (!isAdminRegistered()) {
                // Load login form template
                LOAD_TEMPLATE('admin_login_form', false, $content);
        } // END - if
-} elseif (REQUEST_ISSET_GET(('logout'))) {
+} elseif (REQUEST_ISSET_GET('logout')) {
        // Only try to remove cookies
        if (destroyAdminSession()) {
                // Load logout template
-               if (REQUEST_ISSET_GET(('register'))) {
+               if (REQUEST_ISSET_GET('register')) {
                        // Secure input
-                       $register = REQUEST_GET(('register'));
+                       $register = REQUEST_GET('register');
 
                        // Special logout redirect for installation of given extension
                        LOAD_TEMPLATE(sprintf("admin_logout_%s_install", $register));
@@ -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;