* -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2009 by Roland Haeder *
* Copyright (c) 2009 - 2011 by Mailer Developer Team *
- * For more information visit: http://www.mxchange.org *
+ * For more information visit: http://mxchange.org *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
// 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
} // 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);
$area = 'entrance';
// Check for similar URL variable
- if (isGetRequestElementSet('area')) $area = getRequestElement('area');
+ if (isGetRequestElementSet('area')) {
+ $area = getRequestElement('area');
+ } // END - if
// Load logical-area menu-system file
loadIncludeOnce('inc/modules/admin/lasys-inc.php');
// Create new-style menu system will logical areas
doAdminLogicalArea($area, $action, 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
+ /*
+ * This little call constructs the whole default old and lacky menu system
+ * on left side. It also renders the content on right side
+ */
doAdminAction();
}
break;