Now all parameters will be restored after login

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

diff --git a/inc/modules/admin.php b/inc/modules/admin.php
index 75f57901e1a2c3c32f5abc7f9be247c7c209d166..518ed798387313497f067cb986f463ccfa188ae1 100644 (file)
--- a/inc/modules/admin.php
+++ b/inc/modules/admin.php
@@ -244,25 +244,8 @@ if (!isAdminRegistered()) {
                // Which status do we have?
                switch ($ret) {
                        case 'done': // Admin and password are okay, so we log in now
-                               // Construct URL and redirect
-                               $url = 'modules.php?module=admin&';
-
-                               // Rewrite overview module
-                               if (getWhat() == 'overview') {
-                                       setAction(getActionFromModuleWhat(getModule(), getWhat()));
-                               } // END - if
-
-                               // Add data to URL
-                               if (isWhatSet()) {
-                                       $url .= 'what=' . getWhat();
-                               } elseif (isActionSet()) {
-                                       $url .= 'action=' . getAction();
-                               } elseif (isGetRequestElementSet('area')) {
-                                       $url .= 'area=' . getRequestElement('area');
-                               }
-
                                // Load URL
-                               redirectToUrl($url);
+                               redirectToUrl('modules.php?' . addAllGetRequestParameters());
                                break;
 
                        case '404': // Administrator login not found
@@ -329,31 +312,8 @@ if (!isAdminRegistered()) {
                        } // END - if
                } // END - if
 
-               // Load login form
-               if (isWhatSet()) {
-                       // Restore old what value
-                       $content = merge_array($content, array('target' => 'what', 'value' => getWhat()));
-               } elseif (isActionSet()) {
-                       if (getAction() != 'logout') {
-                               // Restore old action value
-                               $content = merge_array($content, array('target' => 'action', 'value' => getAction()));
-                       } else {
-                               // Set default values
-                               $content = merge_array($content, array('target' => 'action', 'value' => 'login'));
-                       }
-               } elseif (isGetRequestElementSet('area')) {
-                       // Restore old area value
-                       $content = merge_array(
-                               $content,
-                               array(
-                                       'target' => 'area',
-                                       'value'  => getRequestElement('area')
-                               )
-                       );
-               } else {
-                       // Set default values
-                       $content = merge_array($content, array('target' => 'action', 'value' => 'login'));
-               }
+               // Add all parameter
+               $content['all_parameter'] = addAllGetRequestParameters();
 
                // Load login form template
                loadTemplate('admin_login_form', false, $content);