X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin.php;h=05deff7ed5b7ecef3c7aff7161a69803b0db362e;hp=401dfc75d03b69e1e2e56f00ccede303fd51dd6f;hb=04b69ac9f33369cbf654396c4a42cb1fff710ff4;hpb=7fabfadce30a7bea7ce3ad1f1e2e7e5e616f2669

diff --git a/inc/modules/admin.php b/inc/modules/admin.php
index 401dfc75d0..05deff7ed5 100644
--- a/inc/modules/admin.php
+++ b/inc/modules/admin.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 08/31/2003 *
- * ===============                              Last change: 07/02/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 08/31/2003 *
+ * ===================                          Last change: 07/02/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : admin.php                                        *
@@ -18,6 +18,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -45,7 +46,7 @@ if (!defined('__SECURITY')) {
 loadIncludeOnce('inc/modules/admin/admin-inc.php');
 
 // Fix "deleted" cookies in PHP4 (PHP5 does remove them, PHP4 sets them to deleted!)
-fixDeletedCookies(array('admin_login', 'admin_md5', 'admin_last', 'admin_to'));
+fixDeletedCookies(array('admin_login', 'admin_md5', 'admin_last'));
 
 // Init return value
 $ret = 'init';
@@ -53,19 +54,22 @@ $ret = 'init';
 // Is no admin registered?
 if (!isAdminRegistered()) {
 	// Admin is not registered so we have to inform the user
-	if ((isFormSent()) && ((!isPostRequestElementSet('login')) || (!isPostRequestElementSet('pass')) || (strlen(postRequestElement('pass')) < 4))) {
-		setRequestPostElement('ok', '***');
+	if ((isFormSent()) && ((!isPostRequestParameterSet('login')) || (!isPostRequestParameterSet('pass1')) || (strlen(postRequestParameter('pass1')) < 4) || (!isPostRequestParameterSet('pass2')) || (strlen(postRequestParameter('pass2')) < 4) || (postRequestParameter('pass1') != postRequestParameter('pass2')))) {
+		setPostRequestParameter('ok', '***');
 	} // END - if
 
-	if ((isFormSent()) && (postRequestElement('ok') != '***')) {
+	// Clear error message
+	$errorMessage = '';
+
+	if ((isFormSent()) && (postRequestParameter('ok') != '***')) {
 		// Hash the password with the old function because we are here in install mode
-		$hashedPass = md5(postRequestElement('pass'));
+		$hashedPass = md5(postRequestParameter('pass1'));
 
 		// Kill maybe existing session variables
 		destroyAdminSession(false);
 
 		// Do registration
-		$ret = addAdminAccount(postRequestElement('login'), $hashedPass, getConfig('WEBMASTER'));
+		$ret = addAdminAccount(postRequestParameter('login'), $hashedPass, getConfig('WEBMASTER'));
 
 		// Check if registration wents fine
 		switch ($ret) {
@@ -75,167 +79,181 @@ if (!isAdminRegistered()) {
 					// Registering is done
 					redirectToUrl('modules.php?module=admin&amp;register=done');
 				} else {
-					$ret = getMessage('ADMIN_CANNOT_COMPLETE');
+					// Registration incomplete
+					$errorMessage = getMessage('ADMIN_CANNOT_COMPLETE');
+
+					// Set this to have our error message displayed
+					setPostRequestParameter('ok', '***');
 				}
 				break;
 
-			case 'failed':
-				$ret = getMessage('ADMIN_REGISTER_FAILED');
+			case 'failed': // Registration has failed
+				$errorMessage = getMessage('ADMIN_REGISTER_FAILED');
+
+				// Set this to have our error message displayed
+				setPostRequestParameter('ok', '***');
 				break;
 
-			case 'already':
-			default:
-				if ($ret == 'already') {
-					// Admin does already exists!
-					$ret = getMessage('ADMIN_LOGIN_ALREADY_REG');
-				} else {
-					// Any other kind will be logged and interpreted as 'done'
-					logDebugMessage(__FILE__, __LINE__, sprintf("Unknown return code %s from ifAdminLoginDataIsValid() and interpreted as 'done'!", $ret));
-					// @TODO Why is this set to 'done'?
-					$ret = 'done';
-				}
+			case 'already': // Admin does already exists!
+				$errorMessage = getMessage('ADMIN_LOGIN_ALREADY_REG');
 
-				// Admin still not registered?
-				if (!isAdminRegistered()) {
-					// Write to config that registration is done
-					changeDataInFile(getConfig('CACHE_PATH') . 'config-local.php', 'ADMIN-SETUP', "setConfigEntry('ADMIN_REGISTERED', '", "');", 'Y', 0);
+				// Set this to have our error message displayed
+				setPostRequestParameter('ok', '***');
+				break;
 
-					// Load URL for login
-					redirectToUrl('modules.php?module=admin');
-				} // END - if
+			default:
+				// Any other kind will be logged
+				$errorMessage = sprintf("Unknown return code %s from ifAdminLoginDataIsValid().", $ret);
+				logDebugMessage(__FILE__, __LINE__, $errorMessage);
+
+				// Set this to have our error message displayed
+				setPostRequestParameter('ok', '***');
 				break;
 		} // END - switch
-	}
+	} // END - if
 
 	// Whas that action okay?
 	if ($ret != 'done') {
-		// Fixes another notice
+		// Init login name
 		$content['login'] = '';
-		if (isPostRequestElementSet('login')) {
-			$content['login'] = postRequestElement('login');
+		if (isPostRequestParameterSet('login')) {
+			$content['login'] = postRequestParameter('login');
 		} // END - if
 
 		// Init array elements
 		$content['login_message']   = '';
-		$content['pass_message']    = '';
+		$content['pass1_message']    = '';
+		$content['pass2_message']    = '';
 
 		// Yet-another notice-fix
-		if ((isFormSent()) && (postRequestElement('ok') == '***')) {
+		if ((isFormSent()) && (postRequestParameter('ok') == '***')) {
+			// Init variables
+			$loginMessage = '';
+			$pass1Message = '';
+			$pass2Message = '';
+
 			// No login entered?
-			if (!isPostRequestElementSet('login')) $loginMessage = getMessage('ADMIN_NO_LOGIN');
+			if (empty($content['login'])) $loginMessage = getMessage('ADMIN_NO_LOGIN');
 
 			// An error comes back from registration?
-			if (!empty($ret)) $loginMessage = $ret;
+			if ((!empty($ret)) && ($ret != 'init')) $loginMessage = $errorMessage;
 
-			// No password entered?
-			if (!isPostRequestElementSet('pass')) $passwdMessage = getMessage('ADMIN_NO_PASS');
+			// No password 1 entered or to short?
+			if (!isPostRequestParameterSet('pass1')) $pass1Message = getMessage('ADMIN_NO_PASS1');
+			 elseif (strlen(postRequestParameter('pass1')) < 4) $pass1Message = getMessage('ADMIN_SHORT_PASS1');
 
-			// Or password too short?
-			if (strlen(postRequestElement('pass')) < 4) $passwdMessage = getMessage('ADMIN_SHORT_PASS');
+			// No password 2 entered or to short?
+			if (!isPostRequestParameterSet('pass2')) $pass2Message = getMessage('ADMIN_NO_PASS2');
+			 elseif (strlen(postRequestParameter('pass2')) < 4) $pass2Message = getMessage('ADMIN_SHORT_PASS2');
+
+			// Both didn't match?
+			if (postRequestParameter('pass1') != postRequestParameter('pass2')) {
+				// No match
+				if (empty($pass1Message)) $pass1Message = getMessage('ADMIN_PASS1_MISMATCH');
+				if (empty($pass2Message)) $pass2Message = getMessage('ADMIN_PASS2_MISMATCH');
+			} // END - if
 
 			// Output error messages
 			$content['login_message'] = loadTemplate('admin_login_msg', true, $loginMessage);
-			$content['pass_message']  = loadTemplate('admin_login_msg', true, $passwdMessage);
-
-			// Reset variables
-			$loginMessage = ''; $passwdMessage = '';
+			$content['pass1_message'] = loadTemplate('admin_login_msg', true, $pass1Message);
+			$content['pass2_message'] = loadTemplate('admin_login_msg', true, $pass2Message);
 		} // END - if
 
 		// Output message in seperate template
-		loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NOT_REGISTERED'));
+		loadTemplate('admin_settings_saved', false, '{--ADMIN_ACCOUNT_NOT_REGISTERED_YET--}');
 
 		// Load register template
 		loadTemplate('admin_reg_form', false, $content);
-	}
-} elseif (isGetRequestElementSet('reset_pass')) {
+	} // END - if
+} elseif (isGetRequestParameterSet('reset_pass')) {
 	// Is the form submitted?
-	if ((isPostRequestElementSet('send_link')) && (isPostRequestElementSet('email'))) {
+	if ((isPostRequestParameterSet('send_link')) && (isPostRequestParameterSet('email'))) {
 		// Output result
-		loadTemplate('admin_settings_saved', false, sendAdminPasswordResetLink(postRequestElement('email')));
-	} elseif (isGetRequestElementSet('hash')) {
+		loadTemplate('admin_settings_saved', false, sendAdminPasswordResetLink(postRequestParameter('email')));
+	} elseif (isGetRequestParameterSet('hash')) {
 		// Output form for hash validation
-		loadTemplate('admin_validate_reset_hash_form', false, getRequestElement('hash'));
-	} elseif ((isPostRequestElementSet('validate_hash')) && (isPostRequestElementSet('login')) && (isPostRequestElementSet('hash'))) {
+		loadTemplate('admin_validate_reset_hash_form', false, getRequestParameter('hash'));
+	} elseif ((isPostRequestParameterSet('validate_hash')) && (isPostRequestParameterSet('login')) && (isPostRequestParameterSet('hash'))) {
 		// Validate the login data and hash
-		$valid = adminResetValidateHashLogin(postRequestElement('hash'), postRequestElement('login'));
+		$valid = adminResetValidateHashLogin(postRequestParameter('hash'), postRequestParameter('login'));
 
 		// Valid?
 		if ($valid === true) {
 			// Prepare content first
 			$content = array(
-				'hash'  => SQL_ESCAPE(postRequestElement('hash')),
-				'login' => SQL_ESCAPE(postRequestElement('login'))
+				'hash'  => secureString(postRequestParameter('hash')),
+				'login' => secureString(postRequestParameter('login'))
 			);
 
 			// Validation okay so display form for final password change
 			loadTemplate('admin_reset_password_form', false, $content);
 		} else {
 			// Cannot validate the login data and hash
-			loadTemplate('admin_settings_saved', false, getMessage('ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED'));
+			loadTemplate('admin_settings_saved', false, '{--ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED--}');
 		}
-	} elseif ((isPostRequestElementSet('reset_pass')) && (isPostRequestElementSet('hash')) && (isPostRequestElementSet('login')) && (isPostRequestElementSet('pass1')) && (postRequestElement('pass1') == postRequestElement('pass2'))) {
+	} elseif ((isPostRequestParameterSet('reset_pass')) && (isPostRequestParameterSet('hash')) && (isPostRequestParameterSet('login')) && (isPostRequestParameterSet('pass1')) && (postRequestParameter('pass1') == postRequestParameter('pass2'))) {
 		// Okay, we shall the admin password here. So first revalidate the hash
-		if (adminResetValidateHashLogin(postRequestElement('hash'), postRequestElement('login'))) {
+		if (adminResetValidateHashLogin(postRequestParameter('hash'), postRequestParameter('login'))) {
 			// Output result
-			loadTemplate('admin_reset_pass_done', false, doResetAdminPassword(postRequestElement('login'), postRequestElement('pass1')));
+			loadTemplate('admin_reset_pass_done', false, doResetAdminPassword(postRequestParameter('login'), postRequestParameter('pass1')));
 		} else {
 			// Validation failed
-			loadTemplate('admin_settings_saved', false, getMessage('ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED2'));
+			loadTemplate('admin_settings_saved', false, '{--ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED2--}');
 		}
 	} else {
 		// Output reset password form
 		loadTemplate('admin_send_reset_link');
 	}
-} elseif ((!isSessionVariableSet('admin_login')) || (!isSessionVariableSet('admin_md5')) || (!isSessionVariableSet('admin_last')) || (!isSessionVariableSet('admin_to')) || ((getSession('admin_last') + bigintval(getSession('admin_to')) * 3600 * 24) < time())) {
+} elseif ((!isSessionVariableSet('admin_login')) || (!isSessionVariableSet('admin_md5')) || (!isSessionVariableSet('admin_last'))) {
 	// At leat one administrator account was created
-	if ((isSessionVariableSet('admin_login')) && (isSessionVariableSet('admin_md5')) && (isSessionVariableSet('admin_last')) && (isSessionVariableSet('admin_to'))) {
+	if ((isSessionVariableSet('admin_login')) && (isSessionVariableSet('admin_md5')) && (isSessionVariableSet('admin_last'))) {
 		// Timeout for last login, we have to logout first!
 		redirectToUrl('modules.php?module=admin&amp;logout=1');
 	} // END - if
 
-	if (isGetRequestElementSet('register')) {
+	if (isGetRequestParameterSet('register')) {
 		// Registration of first admin is done
-		if (getRequestElement('register') == 'done') loadTemplate('admin_settings_saved', false, getMessage('ADMIN_REGISTER_DONE'));
+		if (getRequestParameter('register') == 'done') loadTemplate('admin_settings_saved', false, '{--ADMIN_REGISTER_DONE--}');
 	} // END - if
 
 	// Check if the admin has submitted data or not
-	if ((isFormSent()) && ((!isPostRequestElementSet('login')) || (!isPostRequestElementSet('pass')) || (strlen(postRequestElement('pass')) < 4))) {
-		setRequestPostElement('ok', '***');
+	if ((isFormSent()) && ((!isPostRequestParameterSet('login')) || (!isPostRequestParameterSet('pass')) || (strlen(postRequestParameter('pass')) < 4))) {
+		setPostRequestParameter('ok', '***');
 	} // END - if
 
-	if ((isFormSent()) && (postRequestElement('ok') != '***')) {
+	if ((isFormSent()) && (postRequestParameter('ok') != '***')) {
 		// All required data was entered so we check his account
-		$ret = ifAdminLoginDataIsValid(postRequestElement('login'), postRequestElement('pass'));
+		$ret = ifAdminLoginDataIsValid(postRequestParameter('login'), postRequestParameter('pass'));
 
 		// 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;';
+				$url = 'modules.php?module=admin&amp;';
 
 				// Rewrite overview module
 				if (getWhat() == 'overview') {
-					setAction(getModeAction(getModule(), getWhat()));
+					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');
+				if (isWhatSet())        $url .= 'what='.getWhat();
+			 	 elseif (isActionSet()) $url .= 'action='.getAction();
+			 	 elseif (isGetRequestParameterSet('area'))  $url .= 'area='.getRequestParameter('area');
 
 			 // Load URL
-			 redirectToUrl($URL);
+			 redirectToUrl($url);
 			 break;
 
 			case '404': // Administrator login not found
-				setRequestPostElement('ok', $ret);
-				$ret = sprintf(getMessage('ADMIN_404'), postRequestElement('login'));
+				setPostRequestParameter('ok', $ret);
+				$ret = getMaskedMessage('ADMIN_ACCOUNT_404', postRequestParameter('login'));
 				destroyAdminSession();
 				break;
 
 			case 'pass': // Wrong password
-				setRequestPostElement('ok', $ret);
-				$ret = '{--WRONG_PASS--} [<a href="{?URL?}/modules.php?module=admin&amp;reset_pass=1">{--ADMIN_RESET_PASS--}</a>]';
+				setPostRequestParameter('ok', $ret);
+				$ret = '{--WRONG_PASS--} [<a href="{%url=modules.php?module=admin&amp;reset_pass=1%}">{--ADMIN_RESET_PASS--}</a>]';
 				destroyAdminSession();
 				break;
 
@@ -248,8 +266,8 @@ if (!isAdminRegistered()) {
 	// Error detected?
 	if ($ret != 'done') {
 		$content['login'] = '';
-		if (isPostRequestElementSet('login')) {
-			$content['login'] = postRequestElement('login');
+		if (isPostRequestParameterSet('login')) {
+			$content['login'] = postRequestParameter('login');
 		} // END - if
 
 		// Init array elements
@@ -261,27 +279,23 @@ if (!isAdminRegistered()) {
 			$loginMessage = ''; $passwdMessage = '';
 
 			// No login entered?
-			if (!isPostRequestElementSet('login')) $loginMessage = getMessage('ADMIN_NO_LOGIN');
+			if (!isPostRequestParameterSet('login')) $loginMessage = getMessage('ADMIN_NO_LOGIN');
 
 			// An error comes back from login?
-			if ((!empty($ret)) && (postRequestElement('ok') == '404')) $loginMessage = $ret;
+			if ((!empty($ret)) && (postRequestParameter('ok') == '404')) $loginMessage = $ret;
 
 			// No password entered?
-			if (!isPostRequestElementSet('pass')) $passwdMessage = getMessage('ADMIN_NO_PASS');
+			if (!isPostRequestParameterSet('pass')) $passwdMessage = getMessage('ADMIN_NO_PASS');
 
 			// Or password too short?
-			if (strlen(postRequestElement('pass')) < 4) $passwdMessage = getMessage('ADMIN_SHORT_PASS');
+			if (strlen(postRequestParameter('pass')) < 4) $passwdMessage = getMessage('ADMIN_SHORT_PASS');
 
 			// An error comes back from login?
-			if ((!empty($ret)) && (postRequestElement('ok') == 'pass')) $passwdMessage = $ret;
+			if ((!empty($ret)) && (postRequestParameter('ok') == 'pass')) $passwdMessage = $ret;
 
 			// Load message template
 			$content['login_message'] = loadTemplate('admin_login_msg', true, $loginMessage);
 			$content['pass_message']  = loadTemplate('admin_login_msg', true, $passwdMessage);
-
-			// Reset variables
-			unset($loginMessage);
-			unset($passwdMessage);
 		} // END - if
 
 		// Load login form
@@ -296,9 +310,15 @@ if (!isAdminRegistered()) {
 				// Set default values
 				$content = merge_array($content, array('target' => 'action', 'value' => 'login'));
 			}
-		} elseif (isGetRequestElementSet('area')) {
+		} elseif (isGetRequestParameterSet('area')) {
 			// Restore old area value
-			$content = merge_array($content, array('target' => 'area', 'value' => getRequestElement('area')));
+			$content = merge_array(
+				$content,
+				array(
+					'target' => 'area',
+					'value'  => getRequestParameter('area')
+				)
+			);
 		} else {
 			// Set default values
 			$content = merge_array($content, array('target' => 'action', 'value' => 'login'));
@@ -307,19 +327,19 @@ if (!isAdminRegistered()) {
 		// Load login form template
 		loadTemplate('admin_login_form', false, $content);
 	} // END - if
-} elseif (isGetRequestElementSet('logout')) {
+} elseif (isGetRequestParameterSet('logout')) {
 	// Only try to remove cookies
 	if (destroyAdminSession()) {
 		// Load logout template
-		if (isGetRequestElementSet('register')) {
+		if (isGetRequestParameterSet('register')) {
 			// Secure input
-			$register = getRequestElement('register');
+			$register = getRequestParameter('register');
 
 			// Special logout redirect for installation of given extension
 			loadTemplate(sprintf("admin_logout_%s_install", $register));
-		} elseif (isGetRequestElementSet('remove')) {
+		} elseif (isGetRequestParameterSet('remove')) {
 			// Secure input
-			$remove = getRequestElement('remove');
+			$remove = getRequestParameter('remove');
 
 			// Special logout redirect for removal of given extension
 			loadTemplate(sprintf("admin_logout_%s_remove", $remove));
@@ -353,7 +373,7 @@ if (!isAdminRegistered()) {
 				$area = 'entrance';
 
 				// Check for similar URL variable
-				if (isGetRequestElementSet('area')) $area = getRequestElement('area');
+				if (isGetRequestParameterSet('area')) $area = getRequestParameter('area');
 
 				// Load logical-area menu-system file
 				loadIncludeOnce('inc/modules/admin/lasys-inc.php');
@@ -363,19 +383,19 @@ if (!isAdminRegistered()) {
 			} else {
 				// This little call constructs the whole default old and lacky menu system
 				// on left side. It also renders the content on right side
-				doAdminAction(getWhat());
+				doAdminAction();
 			}
 			break;
 
 		case '404': // Administrator login not found
-			setRequestPostElement('ok', $ret);
-			addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('ADMIN_404'), getSession('admin_login')));
+			setPostRequestParameter('ok', $ret);
+			loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_ACCOUNT_404', getSession('admin_login')));
 			destroyAdminSession();
 			break;
 
 		case 'pass': // Wrong password
-			setRequestPostElement('ok', $ret);
-			addFatalMessage(__FILE__, __LINE__, getMessage('WRONG_PASS'));
+			setPostRequestParameter('ok', $ret);
+			loadTemplate('admin_settings_saved', false, '{--WRONG_PASS--}');
 			destroyAdminSession();
 			break;