X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin.php;h=1807ee960f078b3e1f691302decddf6655442831;hp=9cb78e56e059c01694762878858df640f4ba0289;hb=e5527fd38a6585c8466dc28d013f12d21eb7c07a;hpb=865d8f7670c976d59d5699d72958c8c00f6af70e

diff --git a/inc/modules/admin.php b/inc/modules/admin.php
index 9cb78e56e0..1807ee960f 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 - 2012 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -136,7 +136,7 @@ if (!isAdminRegistered()) {
 				break;
 
 			default: // Others will be logged
-				logDebugMessage(__FILE__, __LINE__, sprintf("Unknown return code %s from ifAdminLoginDataIsValid()", $ret));
+				logDebugMessage(__FILE__, __LINE__, sprintf('Unknown return code %s from ifAdminLoginDataIsValid()', $ret));
 				break;
 		} // END - switch
 	} // END - if
@@ -169,10 +169,7 @@ if (!isAdminRegistered()) {
 			// Check for password
 			if (!isPostRequestElementSet('admin_password')) {
 				// No password entered?
-				$passwdMessage = '{--ADMIN_NO_PASS--}';
-			} elseif (strlen(postRequestElement('admin_password')) < getConfig('minium_admin_pass_length')) {
-				// Or password too short?
-				$passwdMessage = '{--ADMIN_SHORT_PASS--}';
+				$passwdMessage = '{--ADMIN_NO_PASSWORD--}';
 			} elseif ((!empty($ret)) && (postRequestElement('login') == 'password')) {
 				// An error comes back from login?
 				$passwdMessage = $ret;
@@ -202,20 +199,20 @@ if (!isAdminRegistered()) {
 			$register = getRequestElement('setup');
 
 			// Special logout redirect for installation of given extension
-			loadTemplate(sprintf("admin_logout_%s_install", $register));
+			loadTemplate(sprintf('admin_logout_%s_install', $register));
 		} elseif (isGetRequestElementSet('remove')) {
 			// Secure input
 			$remove = getRequestElement('remove');
 
 			// Special logout redirect for removal of given extension
-			loadTemplate(sprintf("admin_logout_%s_remove", $remove));
+			loadTemplate(sprintf('admin_logout_%s_remove', $remove));
 		} else {
 			// Logged out normally
 			loadTemplate('admin_logout');
 		}
 	} else {
 		// Something went wrong here...
-		loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_LOGOUT_FAILED--}');
+		displayErrorMessage('{--ADMIN_LOGOUT_FAILED--}');
 
 		// Add fatal message
 		addFatalMessage(__FILE__, __LINE__, '{--CANNOT_UNREG_SESS--}');
@@ -265,7 +262,7 @@ if (!isAdminRegistered()) {
 			break;
 
 		default: // Others will be logged
-			logDebugMessage(__FILE__, __LINE__, sprintf("Unknown return code %s from ifAdminCookiesAreValid()", $ret));
+			logDebugMessage(__FILE__, __LINE__, sprintf('Unknown return code %s from ifAdminCookiesAreValid()', $ret));
 			break;
 	} // END - switch
 }