X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin.php;h=761d9181aa0a6ab11251c6a1374f0af26ac73ff6;hb=9fb328e0aa7cd605f2f89e85640815da300a9eb2;hp=75f57901e1a2c3c32f5abc7f9be247c7c209d166;hpb=20741b93fd58620af677a7f1039ffd16ea6ec689;p=mailer.git

diff --git a/inc/modules/admin.php b/inc/modules/admin.php
index 75f57901e1..761d9181aa 100644
--- a/inc/modules/admin.php
+++ b/inc/modules/admin.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * 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 *
@@ -37,7 +37,7 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-	die();
+	exit();
 } // END - if
 
 // Load include file
@@ -64,7 +64,7 @@ if (!isAdminRegistered()) {
 		$hashedPass = md5(postRequestElement('admin_pass1'));
 
 		// Kill maybe existing session variables
-		destroyAdminSession(false);
+		destroyAdminSession(FALSE);
 
 		// Do registration
 		$ret = addAdminAccount(postRequestElement('admin_login'), $hashedPass, getWebmaster());
@@ -76,7 +76,7 @@ if (!isAdminRegistered()) {
 				$done = changeDataInLocalConfigurationFile('ADMIN-SETUP', "setConfigEntry('ADMIN_REGISTERED', '", "');", 'Y', 0);
 
 				// Was it successfull?
-				if ($done === true) {
+				if ($done === TRUE) {
 					// Registering is done
 					redirectToUrl('modules.php?module=admin&register=done');
 				} else {
@@ -166,17 +166,17 @@ if (!isAdminRegistered()) {
 			} // END - if
 
 			// Output error messages
-			$content['login_message'] = loadTemplate('admin_login_msg', true, $loginMessage);
-			$content['pass1_message'] = loadTemplate('admin_login_msg', true, $pass1Message);
-			$content['pass2_message'] = loadTemplate('admin_login_msg', true, $pass2Message);
-			$content['error_message'] = loadTemplate('admin_login_msg', true, $errorMessage);
+			$content['login_message'] = loadTemplate('admin_login_msg', TRUE, $loginMessage);
+			$content['pass1_message'] = loadTemplate('admin_login_msg', TRUE, $pass1Message);
+			$content['pass2_message'] = loadTemplate('admin_login_msg', TRUE, $pass2Message);
+			$content['error_message'] = loadTemplate('admin_login_msg', TRUE, $errorMessage);
 		} // END - if
 
 		// Output message in seperate template
 		displayMessage('{--ADMIN_ACCOUNT_NOT_REGISTERED_YET--}');
 
 		// Load register template
-		loadTemplate('admin_reg_form', false, $content);
+		loadTemplate('admin_reg_form', FALSE, $content);
 	} // END - if
 } elseif (isGetRequestElementSet('reset_pass')) {
 	// Is the form submitted?
@@ -185,13 +185,13 @@ if (!isAdminRegistered()) {
 		displayMessage(sendAdminPasswordResetLink(postRequestElement('email')));
 	} elseif (isGetRequestElementSet('hash')) {
 		// Output form for hash validation
-		loadTemplate('admin_validate_reset_hash_form', false, getRequestElement('hash'));
+		loadTemplate('admin_validate_reset_hash_form', FALSE, getRequestElement('hash'));
 	} elseif ((isPostRequestElementSet('validate_hash')) && (isPostRequestElementSet('admin_login')) && (isPostRequestElementSet('hash'))) {
 		// Validate the login data and hash
 		$valid = adminResetValidateHashLogin(postRequestElement('hash'), postRequestElement('admin_login'));
 
 		// Valid?
-		if ($valid === true) {
+		if ($valid === TRUE) {
 			// Prepare content first
 			$content = array(
 				'hash'        => postRequestElement('hash'),
@@ -199,7 +199,7 @@ if (!isAdminRegistered()) {
 			);
 
 			// Validation okay so display form for final password change
-			loadTemplate('admin_reset_password_form', false, $content);
+			loadTemplate('admin_reset_password_form', FALSE, $content);
 		} else {
 			// Cannot validate the login data and hash
 			displayMessage('{--ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED--}');
@@ -208,7 +208,7 @@ if (!isAdminRegistered()) {
 		// Okay, we shall the admin password here. So first revalidate the hash
 		if (adminResetValidateHashLogin(postRequestElement('hash'), postRequestElement('admin_login'))) {
 			// Output result
-			loadTemplate('admin_reset_password_done', false, doResetAdminPassword(postRequestElement('admin_login'), postRequestElement('admin_pass1')));
+			loadTemplate('admin_reset_password_done', FALSE, doResetAdminPassword(postRequestElement('admin_login'), postRequestElement('admin_pass1')));
 		} else {
 			// Validation failed
 			displayMessage('{--ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED2--}');
@@ -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,48 +298,25 @@ 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;
 			}
 
 			// Load message templates if the messages have been set
 			if (!empty($loginMessage)) {
-				$content['login_message'] = loadTemplate('admin_login_msg', true, $loginMessage);
+				$content['login_message'] = loadTemplate('admin_login_msg', TRUE, $loginMessage);
 			} // END - if
 			if (!empty($passwdMessage)) {
-				$content['pass_message']  = loadTemplate('admin_login_msg', true, $passwdMessage);
+				$content['pass_message']  = loadTemplate('admin_login_msg', TRUE, $passwdMessage);
 			} // 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);
+		loadTemplate('admin_login_form', FALSE, $content);
 	} // END - if
 } elseif (isGetRequestElementSet('logout')) {
 	// Only try to remove cookies
@@ -380,7 +340,7 @@ if (!isAdminRegistered()) {
 		}
 	} else {
 		// Something went wrong here...
-		loadTemplate('admin_settings_unsaved', false, '{--ADMIN_LOGOUT_FAILED--}');
+		loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_LOGOUT_FAILED--}');
 
 		// Add fatal message
 		addFatalMessage(__FILE__, __LINE__, '{--CANNOT_UNREG_SESS--}');
@@ -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;