Fixes for auto-activation of extensions while registration phase

[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 f91f2aedd4e6126dc03cefe6465ee6c5151bc326..2bf2bbee0d7ff7cebc1c7aac46ea47071a38cc04 100644 (file)
--- a/inc/modules/admin/what-lock_user.php
+++ b/inc/modules/admin/what-lock_user.php
@@ -48,7 +48,7 @@ addMenuDescription('admin', __FILE__);
 // Is a userid set?
 if (isGetRequestParameterSet('userid')) {
        // Action not performed by default
-       $ACT = false;
+       $isActive = false;
 
        // Load user's data
        if (fetchUserData(getRequestParameter('userid'))) {
@@ -71,12 +71,12 @@ if (isGetRequestParameterSet('userid')) {
                                $message = loadEmailTemplate('lock-user', array('text' => postRequestParameter('reason')), bigintval(getRequestParameter('userid')));
 
                                // Send away...
-                               sendEmail(bigintval(getRequestParameter('userid')), getMessage('ADMIN_LOCKED_SUBJ'), $message);
+                               sendEmail(bigintval(getRequestParameter('userid')), '{--ADMIN_LOCKED_SUBJECT--}', $message);
                        } // END - if
 
                        // Prepare message
                        $message = getMaskedMessage('USER_ACCOUNT_LOCKED', bigintval(getRequestParameter('userid')));
-                       $ACT = true;
+                       $isActive = true;
                } elseif ((isPostRequestParameterSet('unlock')) && (getUserData('status') == 'LOCKED')) {
                        // Ok, unlock the account!
                        if (isExtensionInstalledAndNewer('user', '0.3.5')) {
@@ -103,7 +103,7 @@ LIMIT 1",
                                $message = loadEmailTemplate('unlock-user', array('text' => postRequestParameter('reason')), bigintval(getRequestParameter('userid')));
 
                                // Send away...
-                               sendEmail(bigintval(getRequestParameter('userid')), getMessage('ADMIN_UNLOCKED_SUBJ'), $message);
+                               sendEmail(bigintval(getRequestParameter('userid')), '{--ADMIN_UNLOCKED_SUBJECT--}', $message);
                                if (isExtensionActive('rallye')) {
                                        addUserToReferalRallye(getRequestParameter('userid'));
                                } // END - if
@@ -111,10 +111,10 @@ LIMIT 1",
 
                        // Prepare message
                        $message = getMaskedMessage('USER_ACCOUNT_UNLOCKED', bigintval(getRequestParameter('userid')));
-                       $ACT = true;
+                       $isActive = true;
                } elseif (isFormSent('del')) {
                        // Delete the account
-                       $ACT = true;
+                       $isActive = true;
                        loadIncludeOnce('inc/modules/admin/what-del_user.php');
                } elseif (isPostRequestParameterSet('no')) {
                        // Do not lock him...
@@ -141,8 +141,8 @@ LIMIT 1",
 
                                        case 'UNCONFIRMED': // Unconfirmed accounts cannot be unlocked!
                                                $content['ok'] = 'del';
-                                               $content['header'] = getMaskedMessage('ADMIN_HEADER_DEL_ACCOUNT', $content['userid']);
-                                               $content['text']   = getMaskedMessage('ADMIN_TEXT_DEL_ACCOUNT', $content['userid']);
+                                               $content['header'] = getMaskedMessage('ADMIN_HEADER_DELETE_ACCOUNT', $content['userid']);
+                                               $content['text']   = getMaskedMessage('ADMIN_TEXT_DELETE_ACCOUNT', $content['userid']);
                                                break;
                                }
 
@@ -158,7 +158,7 @@ LIMIT 1",
                if (!empty($url)) {
                        // Reload and die...
                        redirectToUrl($url);
-               } elseif ($ACT) {
+               } elseif ($isActive) {
                        // An action was performed...
                        if (!empty($message)) {
                                loadTemplate('admin_settings_saved', false, '<div class="admin_failed">' . $message . '</div>');