X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin.php;h=261878ad0623b77382ee3a1a45ba6dd704a511d4;hp=593dec32bc2a525bb0e1c42b0d6165c9efd47128;hb=e8ca54fe91872ab95a6ffdc4f1268bf18889021d;hpb=7720eafcce1bf3996657d7cb1a748b51a706b425

diff --git a/inc/modules/admin.php b/inc/modules/admin.php
index 593dec32bc..261878ad06 100644
--- a/inc/modules/admin.php
+++ b/inc/modules/admin.php
@@ -14,8 +14,6 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
@@ -46,7 +44,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'));
+fixDeletedCookies(array('admin_id', 'admin_md5', 'admin_last'));
 
 // Init return value
 $ret = 'init';
@@ -74,13 +72,13 @@ if (!isAdminRegistered()) {
 		// Check if registration wents fine
 		switch ($ret) {
 			case 'done':
-				$done = changeDataInFile(getConfig('CACHE_PATH') . 'config-local.php', 'ADMIN-SETUP', "setConfigEntry('ADMIN_REGISTERED', '", "');", 'Y', 0);
+				$done = changeDataInFile(getCachePath() . 'config-local.php', 'ADMIN-SETUP', "setConfigEntry('ADMIN_REGISTERED', '", "');", 'Y', 0);
 				if ($done === true) {
 					// Registering is done
 					redirectToUrl('modules.php?module=admin&register=done');
 				} else {
 					// Registration incomplete
-					$errorMessage = getMessage('ADMIN_CANNOT_COMPLETE');
+					$errorMessage = '{--ADMIN_CANNOT_COMPLETE--}';
 
 					// Set this to have our error message displayed
 					setPostRequestParameter('ok', '***');
@@ -88,14 +86,14 @@ if (!isAdminRegistered()) {
 				break;
 
 			case 'failed': // Registration has failed
-				$errorMessage = getMessage('ADMIN_REGISTER_FAILED');
+				$errorMessage = '{--ADMIN_REGISTER_FAILED--}';
 
 				// Set this to have our error message displayed
 				setPostRequestParameter('ok', '***');
 				break;
 
 			case 'already': // Admin does already exists!
-				$errorMessage = getMessage('ADMIN_LOGIN_ALREADY_REG');
+				$errorMessage = '{--ADMIN_LOGIN_ALREADY_REG--}';
 
 				// Set this to have our error message displayed
 				setPostRequestParameter('ok', '***');
@@ -133,24 +131,24 @@ if (!isAdminRegistered()) {
 			$pass2Message = '';
 
 			// No login entered?
-			if (empty($content['login'])) $loginMessage = getMessage('ADMIN_NO_LOGIN');
+			if (empty($content['login'])) $loginMessage = '{--ADMIN_NO_LOGIN--}';
 
 			// An error comes back from registration?
 			if ((!empty($ret)) && ($ret != 'init')) $loginMessage = $errorMessage;
 
 			// 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');
+			if (!isPostRequestParameterSet('pass1')) $pass1Message = '{--ADMIN_NO_PASS1--}';
+			 elseif (strlen(postRequestParameter('pass1')) < 4) $pass1Message = '{--ADMIN_SHORT_PASS1--}';
 
 			// 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');
+			if (!isPostRequestParameterSet('pass2')) $pass2Message = '{--ADMIN_NO_PASS2--}';
+			 elseif (strlen(postRequestParameter('pass2')) < 4) $pass2Message = '{--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');
+				if (empty($pass1Message)) $pass1Message = '{--ADMIN_PASS1_MISMATCH--}';
+				if (empty($pass2Message)) $pass2Message = '{--ADMIN_PASS2_MISMATCH--}';
 			} // END - if
 
 			// Output error messages
@@ -160,7 +158,7 @@ if (!isAdminRegistered()) {
 		} // END - if
 
 		// Output message in seperate template
-		loadTemplate('admin_settings_saved', false, getMessage('ADMIN_ACCOUNT_NOT_REGISTERED_YET'));
+		loadTemplate('admin_settings_saved', false, '{--ADMIN_ACCOUNT_NOT_REGISTERED_YET--}');
 
 		// Load register template
 		loadTemplate('admin_reg_form', false, $content);
@@ -186,44 +184,44 @@ if (!isAdminRegistered()) {
 			);
 
 			// Validation okay so display form for final password change
-			loadTemplate('admin_reset_password_form', false, $content);
+			loadTemplate('form_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 ((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(postRequestParameter('hash'), postRequestParameter('login'))) {
 			// Output result
-			loadTemplate('admin_reset_pass_done', false, doResetAdminPassword(postRequestParameter('login'), postRequestParameter('pass1')));
+			loadTemplate('form_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'))) {
+} elseif ((!isSessionVariableSet('admin_id')) || (!isSessionVariableSet('admin_md5')) || (!isSessionVariableSet('admin_last'))) {
 	// At leat one administrator account was created
-	if ((isSessionVariableSet('admin_login')) && (isSessionVariableSet('admin_md5')) && (isSessionVariableSet('admin_last'))) {
+	if ((isSessionVariableSet('admin_id')) && (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 (isGetRequestParameterSet('register')) {
 		// Registration of first admin is done
-		if (getRequestParameter('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()) && ((!isPostRequestParameterSet('login')) || (!isPostRequestParameterSet('pass')) || (strlen(postRequestParameter('pass')) < 4))) {
+	if ((isFormSent()) && ((!isPostRequestParameterSet('login')) || (!isPostRequestParameterSet('password')) || (strlen(postRequestParameter('password')) < 4))) {
 		setPostRequestParameter('ok', '***');
 	} // END - if
 
 	if ((isFormSent()) && (postRequestParameter('ok') != '***')) {
 		// All required data was entered so we check his account
-		$ret = ifAdminLoginDataIsValid(postRequestParameter('login'), postRequestParameter('pass'));
+		$ret = ifAdminLoginDataIsValid(postRequestParameter('login'), postRequestParameter('password'));
 
 		// Which status do we have?
 		switch ($ret) {
@@ -251,7 +249,7 @@ if (!isAdminRegistered()) {
 				destroyAdminSession();
 				break;
 
-			case 'pass': // Wrong password
+			case 'password': // Wrong password
 				setPostRequestParameter('ok', $ret);
 				$ret = '{--WRONG_PASS--} [<a href="{%url=modules.php?module=admin&amp;reset_pass=1%}">{--ADMIN_RESET_PASS--}</a>]';
 				destroyAdminSession();
@@ -279,19 +277,19 @@ if (!isAdminRegistered()) {
 			$loginMessage = ''; $passwdMessage = '';
 
 			// No login entered?
-			if (!isPostRequestParameterSet('login')) $loginMessage = getMessage('ADMIN_NO_LOGIN');
+			if (!isPostRequestParameterSet('login')) $loginMessage = '{--ADMIN_NO_LOGIN--}';
 
 			// An error comes back from login?
 			if ((!empty($ret)) && (postRequestParameter('ok') == '404')) $loginMessage = $ret;
 
 			// No password entered?
-			if (!isPostRequestParameterSet('pass')) $passwdMessage = getMessage('ADMIN_NO_PASS');
+			if (!isPostRequestParameterSet('password')) $passwdMessage = '{--ADMIN_NO_PASS--}';
 
 			// Or password too short?
-			if (strlen(postRequestParameter('pass')) < 4) $passwdMessage = getMessage('ADMIN_SHORT_PASS');
+			if (strlen(postRequestParameter('password')) < 4) $passwdMessage = '{--ADMIN_SHORT_PASS--}';
 
 			// An error comes back from login?
-			if ((!empty($ret)) && (postRequestParameter('ok') == 'pass')) $passwdMessage = $ret;
+			if ((!empty($ret)) && (postRequestParameter('ok') == 'password')) $passwdMessage = $ret;
 
 			// Load message template
 			$content['login_message'] = loadTemplate('admin_login_msg', true, $loginMessage);
@@ -349,14 +347,14 @@ if (!isAdminRegistered()) {
 		}
 	} else {
 		// Something went wrong here...
-		loadTemplate('admin_settings_saved', false, '<div class="admin_fatal">{--ADMIN_LOGOUT_FAILED--}</div>');
+		loadTemplate('admin_settings_unsaved', false, '{--ADMIN_LOGOUT_FAILED--}');
 
 		// Add fatal message
-		addFatalMessage(__FILE__, __LINE__, getMessage('CANNOT_UNREG_SESS'));
+		addFatalMessage(__FILE__, __LINE__, '{--CANNOT_UNREG_SESS--}');
 	}
 } else {
 	// Maybe an Admin want's to login?
-	$ret = ifAdminCookiesAreValid(getSession('admin_login'), getSession('admin_md5'));
+	$ret = ifAdminCookiesAreValid(getSession('admin_id'), getSession('admin_md5'));
 
 	// Check status
 	switch ($ret) {
@@ -389,13 +387,13 @@ if (!isAdminRegistered()) {
 
 		case '404': // Administrator login not found
 			setPostRequestParameter('ok', $ret);
-			loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_ACCOUNT_404', getSession('admin_login')));
+			loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_ACCOUNT_404', getSession('admin_id')));
 			destroyAdminSession();
 			break;
 
-		case 'pass': // Wrong password
+		case 'password': // Wrong password
 			setPostRequestParameter('ok', $ret);
-			loadTemplate('admin_settings_saved', false, getMessage('WRONG_PASS'));
+			loadTemplate('admin_settings_saved', false, '{--WRONG_PASS--}');
 			destroyAdminSession();
 			break;