From d80efc731c3877e4b4a38aa271ed16423228adbe Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Thu, 28 Jul 2011 23:42:00 +0000
Subject: [PATCH] Moved if() block to make random passwords possible again

---
 inc/libs/register_functions.php               | 40 +++++++++----------
 .../de/emails/guest/guest_user_confirmed.tpl  |  2 +-
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/inc/libs/register_functions.php b/inc/libs/register_functions.php
index f4f35afea2..c768ccfbbd 100644
--- a/inc/libs/register_functions.php
+++ b/inc/libs/register_functions.php
@@ -174,26 +174,6 @@ function isRegistrationDataComplete () {
 	// Set it back in request
 	setPostRequestArray($postArray);
 
-	// Did he enter his password twice?
-	if (((!isPostRequestParameterSet('pass1')) || (!isPostRequestParameterSet('pass2'))) || ((postRequestParameter('pass1') != postRequestParameter('pass2')) && (isPostRequestParameterSet('pass1')) && (isPostRequestParameterSet('pass2')))) {
-		if ((postRequestParameter('pass1') != postRequestParameter('pass2')) && (isPostRequestParameterSet('pass1')) && (isPostRequestParameterSet('pass2'))) {
-			setPostRequestParameter('pass1', '!');
-			setPostRequestParameter('pass2', '!');
-		} else {
-			if (!isPostRequestParameterSet('pass1')) {
-				setPostRequestParameter('pass1', '!');
-			} else {
-				setPostRequestParameter('pass1', '');
-			}
-			if (!isPostRequestParameterSet('pass2')) {
-				setPostRequestParameter('pass2', '!');
-			} else {
-				setPostRequestParameter('pass2', '');
-			}
-		}
-		$isOkay = false;
-	} // END - if
-
 	// Are both passwords zero length?
 	if ((strlen(postRequestParameter('pass1')) == 0) && (strlen(postRequestParameter('pass2')) == 0) && ($isOkay === true)) {
 		// Is the extension 'register' newer or equal 0.5.5?
@@ -214,6 +194,26 @@ function isRegistrationDataComplete () {
 		}
 	} // END - if
 
+	// Did he enter his password twice?
+	if (((!isPostRequestParameterSet('pass1')) || (!isPostRequestParameterSet('pass2'))) || ((postRequestParameter('pass1') != postRequestParameter('pass2')) && (isPostRequestParameterSet('pass1')) && (isPostRequestParameterSet('pass2')))) {
+		if ((postRequestParameter('pass1') != postRequestParameter('pass2')) && (isPostRequestParameterSet('pass1')) && (isPostRequestParameterSet('pass2'))) {
+			setPostRequestParameter('pass1', '!');
+			setPostRequestParameter('pass2', '!');
+		} else {
+			if (!isPostRequestParameterSet('pass1')) {
+				setPostRequestParameter('pass1', '!');
+			} else {
+				setPostRequestParameter('pass1', '');
+			}
+			if (!isPostRequestParameterSet('pass2')) {
+				setPostRequestParameter('pass2', '!');
+			} else {
+				setPostRequestParameter('pass2', '');
+			}
+		}
+		$isOkay = false;
+	} // END - if
+
 	// Is the password long enouth?
 	if ((strlen(postRequestParameter('pass1')) < getPassLen()) && ($isOkay === true)) {
 		$GLOBALS['registration_short_password'] = true;
diff --git a/templates/de/emails/guest/guest_user_confirmed.tpl b/templates/de/emails/guest/guest_user_confirmed.tpl
index 45bb20a3b2..572aec4681 100644
--- a/templates/de/emails/guest/guest_user_confirmed.tpl
+++ b/templates/de/emails/guest/guest_user_confirmed.tpl
@@ -7,7 +7,7 @@ Sie k&ouml;nnen sich nun hier einloggen:
 Ihre Login-Id lautet: $userid
 URL zum Login: {?URL?}/login.php
 
-F&uuml;r Ihre Anmeldung werden wir Ihnen als Willkommensgutschrift {%config,translateComma=points_register%} {?POINTS?} gutschreiben, sobald Sie {?ref_payout?} Mails best&auml;tigt haben. Erst dann k&ouml;nnen Sie Mails an die anderen Mitglieder verschicken!
+F&uuml;r Ihre Anmeldung werden wir Ihnen als Willkommensgutschrift {%config,translateComma=points_register%} {?POINTS?} gutschreiben, sobald Sie {?ref_payout?} Mails best&auml;tigt haben. Erst dann k&ouml;nnen Sie Mails an andere Mitglieder verschicken!
 
 Wir w&uuml;nschen Ihnen viel Spass und Erfolg beim Mail-Versand!
 
-- 
2.39.5