Fix for rewritting code

[mailer.git] / inc / modules / admin / what-lock_user.php

diff --git a/inc/modules/admin/what-lock_user.php b/inc/modules/admin/what-lock_user.php
index 4c341400e1d4c62ada0457b076048899ab2579dc..6aeae8ae2bac53b9ce259cf40cde1725e7a179fe 100644 (file)
--- a/inc/modules/admin/what-lock_user.php
+++ b/inc/modules/admin/what-lock_user.php
@@ -52,7 +52,7 @@ if (isGetRequestElementSet('userid')) {
        // Load user's data
        if (fetchUserData(getRequestElement('userid'))) {
                // Is a lock reason set?
-               if ((isPostRequestElementSet('lock')) && ($status != 'LOCKED')) {
+               if ((isPostRequestElementSet('lock')) && (getUserData('status') != 'LOCKED')) {
                        // Ok, lock the account!
                        if (getExtensionVersion('user') >= '0.3.5') {
                                // Lock with reason
@@ -76,7 +76,7 @@ if (isGetRequestElementSet('userid')) {
                        // Prepare message
                        $message = sprintf(getMessage('USER_ACCOUNT_LOCKED'), getRequestElement('userid'));
                        $ACT = true;
-               } elseif ((isPostRequestElementSet(('unlock'))) && ($status == 'LOCKED')) {
+               } elseif ((isPostRequestElementSet('unlock')) && (getUserData('status') == 'LOCKED')) {
                        // Ok, unlock the account!
                        if (getExtensionVersion('user') >= '0.3.5') {
                                // Reset lock reason as well
@@ -125,10 +125,11 @@ LIMIT 1",
                                $content['email']   = generateEmailLink(getUserData('email'), 'user_data');
                                $content['surname'] = getUserData('surname');
                                $content['family']  = getUserData('family');
+                               $content['status']  = getUserData('status');
                                $content['userid']  = bigintval(getRequestElement('userid'));
 
                                // Realy want to lock?
-                               switch ($status) {
+                               switch ($content['status']) {
                                        case 'CONFIRMED': // Yes, lock him down... ;-)
                                                $content['ok']     = 'lock';
                                                $content['header'] = sprintf(getMessage('ADMIN_HEADER_LOCK_ACCOUNT'), $content['userid']);
@@ -136,7 +137,7 @@ LIMIT 1",
                                                break;
 
                                        case 'LOCKED': // Unlock the user
-                                               $content['ok']     = $lock;
+                                               $content['ok']     = 'unlock';
                                                $content['header'] = sprintf(getMessage('ADMIN_HEADER_UNLOCK_ACCOUNT'), $content['userid']);
                                                $content['text']   = sprintf(getMessage('ADMIN_TEXT_UNLOCK_ACCOUNT'), $content['userid']);
                                                break;
@@ -148,6 +149,9 @@ LIMIT 1",
                                                break;
                                }
 
+                               // Translate user status
+                               $content['status'] = translateUserStatus($content['status']);
+
                                // Output form
                                loadTemplate('admin_lock_user', false, $content);
                        } else {