Rewrote some parts:

[mailer.git] / inc / modules / admin.php

diff --git a/inc/modules/admin.php b/inc/modules/admin.php
index ef900aec04627657b838bcf1af7172e595f800e7..1807ee960f078b3e1f691302decddf6655442831 100644 (file)
--- a/inc/modules/admin.php
+++ b/inc/modules/admin.php
@@ -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,13 +199,13 @@ 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');
@@ -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
 }