X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin.php;h=fec5cc9fc509d9f6748aa08f012c61600bb5014d;hp=9bb05dc9ec0814cf6ddd19103a2d8452f32abc84;hb=5bdeaf8b452206598b6c6cd4f941145b11a0eccc;hpb=3daede4c904e23905c3e48dd6749019deca0a0e0

diff --git a/inc/modules/admin.php b/inc/modules/admin.php
index 9bb05dc9ec..fec5cc9fc5 100644
--- a/inc/modules/admin.php
+++ b/inc/modules/admin.php
@@ -170,7 +170,7 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
 			LOAD_TEMPLATE("admin_reset_password_form", false, $content);
 		} else {
 			// Cannot validate the login data and hash
-			LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED);
+			LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED'));
 		}
 	} elseif ((isset($_POST['reset_pass'])) && (!empty($_POST['hash'])) && (!empty($_POST['login'])) && (!empty($_POST['pass1'])) && ($_POST['pass1'] == $_POST['pass2'])) {
 		// Okay, we shall the admin password here. So first revalidate the hash
@@ -182,7 +182,7 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
 			LOAD_TEMPLATE("admin_reset_pass_done", false, $OUT);
 		} else {
 			// Validation failed
-			LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED2);
+			LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED2'));
 		}
 	} else {
 		// Output reset password form
@@ -197,7 +197,7 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
 
 	if (!empty($_GET['register'])) {
 		// Registration of first admin is done
-		if ($_GET['register'] == "done") OUTPUT_HTML("<STRONG class=\"admin\">".ADMIN_REGISTER_DONE."</STRONG>");
+		if ($_GET['register'] == "done") LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_REGISTER_DONE'));
 	} // END - if
 
 	// Check if the admin has submitted data or not
@@ -229,13 +229,13 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
 
 		case "404": // Administrator login not found
 			$_POST['ok'] = $ret;
-			$ret = ADMIN_NOT_FOUND;
+			$ret = getMessage('ADMIN_NOT_FOUND');
 			DESTROY_ADMIN_SESSION();
 			break;
 
 		case "pass": // Wrong password
 			$_POST['ok'] = $ret;
-			$ret = WRONG_PASS." [<A href=\"".URL."/modules.php?module=admin&amp;reset_pass=1\">".ADMIN_RESET_PASS."</A>]\n";
+			$ret = "{!WRONG_PASS!} [<a href=\"{!URL!}/modules.php?module=admin&amp;reset_pass=1\">{!ADMIN_RESET_PASS!}</a>]\n";
 			DESTROY_ADMIN_SESSION();
 			break;
 
@@ -329,7 +329,7 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
 		}
 	} else {
 		// Something went wrong here...
-		OUTPUT_HTML("<STRONG class=\"admin_fatal\">".ADMIN_LOGOUT_FAILED."</STRONG>");
+		LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"admin_fatal\">".ADMIN_LOGOUT_FAILED."</div>");
 
 		// Add fatal message
 		addFatalMessage(CANNOT_UNREG_SESS);