X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin.php;h=b9578683dd45dc676848432c5aade2730492d51e;hp=889af1f25d99cc59ae119a5cb974253c2ae89ca7;hb=63f159414369b5ea19a8ca75d8cd8033c45d8341;hpb=2379934be6a196a54f4155bb8e24c49b20736969

diff --git a/inc/modules/admin.php b/inc/modules/admin.php
index 889af1f25d..b9578683dd 100644
--- a/inc/modules/admin.php
+++ b/inc/modules/admin.php
@@ -16,8 +16,8 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * 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 *
@@ -37,7 +37,7 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-	die();
+	exit();
 } // END - if
 
 // Load include file
@@ -234,45 +234,28 @@ if (!isAdminRegistered()) {
 
 	// Check if the admin has submitted data or not
 	if ((isFormSent()) && ((!isPostRequestElementSet('admin_login')) || (!isPostRequestElementSet('admin_password')) || (strlen(postRequestElement('admin_password')) < getConfig('minium_admin_pass_length')))) {
-		setPostRequestElement('ok', '***');
+		setPostRequestElement('login', '***');
 	} // END - if
 
-	if ((isFormSent()) && (postRequestElement('ok') != '***')) {
+	if ((isFormSent('login')) && (postRequestElement('login') != '***')) {
 		// All required data was entered so we check his account
 		$ret = ifAdminLoginDataIsValid(postRequestElement('admin_login'), postRequestElement('admin_password'));
 
 		// 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&amp;';
-
-				// 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
-				setPostRequestElement('ok', $ret);
+				setPostRequestElement('login', $ret);
 				$ret = '{%message,ADMIN_ACCOUNT_404=' . postRequestElement('admin_login') . '%}';
 				destroyAdminSession();
 				break;
 
 			case 'password': // Wrong password
-				setPostRequestElement('ok', $ret);
+				setPostRequestElement('login', $ret);
 				$ret = '{--WRONG_PASS--} [<a href="{%url=modules.php?module=admin&amp;reset_pass=1%}">{--ADMIN_RESET_PASS--}</a>]';
 				destroyAdminSession();
 				break;
@@ -294,7 +277,7 @@ if (!isAdminRegistered()) {
 		$content['login_message'] = '';
 		$content['pass_message']  = '';
 
-		if (isFormSent()) {
+		if (isFormSent('login')) {
 			// Set messages to zero
 			$loginMessage = '';
 			$passwdMessage = '';
@@ -303,7 +286,7 @@ if (!isAdminRegistered()) {
 			if (!isPostRequestElementSet('admin_login')) {
 				// No login entered?
 				$loginMessage = '{--ADMIN_NO_LOGIN--}';
-			} elseif ((!empty($ret)) && (postRequestElement('ok') == '404')) {
+			} elseif ((!empty($ret)) && (postRequestElement('login') == '404')) {
 				// An error comes back from login?
 				$loginMessage = $ret;
 			}
@@ -315,7 +298,7 @@ if (!isAdminRegistered()) {
 			} elseif (strlen(postRequestElement('admin_password')) < getConfig('minium_admin_pass_length')) {
 				// Or password too short?
 				$passwdMessage = '{--ADMIN_SHORT_PASS--}';
-			} elseif ((!empty($ret)) && (postRequestElement('ok') == 'password')) {
+			} elseif ((!empty($ret)) && (postRequestElement('login') == 'password')) {
 				// An error comes back from login?
 				$passwdMessage = $ret;
 			}
@@ -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);
@@ -396,33 +356,29 @@ if (!isAdminRegistered()) {
 			runFilterChain('check_admin_acl');
 
 			// Check for version and switch between old menu system and new intelligent menu system
-			if ((adminGetMenuMode() == 'NEW') && (isIncludeReadable('inc/modules/admin/lasys-inc.php'))) {
-				// Default area is the entrance, of course
-				$area = 'entrance';
-
-				// Check for similar URL variable
-				if (isGetRequestElementSet('area')) $area = getRequestElement('area');
-
-				// Load logical-area menu-system file
-				loadIncludeOnce('inc/modules/admin/lasys-inc.php');
+			if (adminGetMenuMode() == 'NEW') {
+				// Load include for admin AJAX
+				loadIncludeOnce('inc/ajax/ajax_admin.php');
 
-				// Create new-style menu system will logical areas
-				doAdminLogicalArea($area, $action, getWhat());
+				// Load main template
+				loadTemplate('admin_ajax_main');
 			} 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;
 
 		case '404': // Administrator login not found
-			setPostRequestElement('ok', $ret);
+			setPostRequestElement('login', $ret);
 			displayMessage('{%message,ADMIN_ACCOUNT_404=' . getCurrentAdminId() . '%}');
 			destroyAdminSession();
 			break;
 
 		case 'password': // Wrong password
-			setPostRequestElement('ok', $ret);
+			setPostRequestElement('login', $ret);
 			displayMessage('{--WRONG_PASS--}');
 			destroyAdminSession();
 			break;