Several code cleanups:

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

diff --git a/inc/modules/admin.php b/inc/modules/admin.php
index 572888450ffb638c05c6e4ca6cd53ec2a0d5ff1f..d2b5e4cf246619045a0ecc7244b04677319f3372 100644 (file)
--- a/inc/modules/admin.php
+++ b/inc/modules/admin.php
@@ -194,8 +194,8 @@ if (!isAdminRegistered()) {
                if ($valid === true) {
                        // Prepare content first
                        $content = array(
-                               'hash'  => secureString(postRequestParameter('hash')),
-                               'login' => secureString(postRequestParameter('login'))
+                               'hash'  => postRequestParameter('hash'),
+                               'login' => postRequestParameter('login')
                        );
 
                        // Validation okay so display form for final password change
@@ -267,7 +267,7 @@ if (!isAdminRegistered()) {
 
                        case '404': // Administrator login not found
                                setPostRequestParameter('ok', $ret);
-                               $ret = getMaskedMessage('ADMIN_ACCOUNT_404', postRequestParameter('login'));
+                               $ret = '{%message,ADMIN_ACCOUNT_404=' . postRequestParameter('login') . '%}';
                                destroyAdminSession();
                                break;
 
@@ -417,7 +417,7 @@ if (!isAdminRegistered()) {
 
                case '404': // Administrator login not found
                        setPostRequestParameter('ok', $ret);
-                       displayMessage(getMaskedMessage('ADMIN_ACCOUNT_404', getCurrentAdminId()));
+                       displayMessage('{%message,ADMIN_ACCOUNT_404=' . getCurrentAdminId() . '%}');
                        destroyAdminSession();
                        break;