Way more usage of EL 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 b01c6d3627a6ff624e463e36230d9011a19fe25c..d5ca361a05144c718a6248aa6d08aa6491bc36b5 100644 (file)
--- a/inc/modules/admin/what-lock_user.php
+++ b/inc/modules/admin/what-lock_user.php
@@ -73,7 +73,7 @@ if (isGetRequestParameterSet('userid')) {
                        } // END - if
 
                        // Prepare message
-                       $message = getMaskedMessage('ADMIN_USER_ACCOUNT_LOCKED', bigintval(getRequestParameter('userid')));
+                       $message = '{%message,ADMIN_USER_ACCOUNT_LOCKED=' . bigintval(getRequestParameter('userid')) . '%}';
                        $isActive = true;
                } elseif ((isPostRequestParameterSet('unlock')) && (getUserData('status') == 'LOCKED')) {
                        // Ok, unlock the account!
@@ -108,7 +108,7 @@ LIMIT 1",
                        } // END - if
 
                        // Prepare message
-                       $message = getMaskedMessage('ADMIN_USER_ACCOUNT_UNLOCKED', bigintval(getRequestParameter('userid')));
+                       $message = '{%message,ADMIN_USER_ACCOUNT_UNLOCKED=' . bigintval(getRequestParameter('userid')) . '%}';
                        $isActive = true;
                } elseif (isFormSent('delete')) {
                        // Delete the account
@@ -127,20 +127,20 @@ LIMIT 1",
                                switch (getUserData('status')) {
                                        case 'CONFIRMED': // Yes, lock him down... ;-)
                                                $content['ok']     = 'lock';
-                                               $content['header'] = getMaskedMessage('ADMIN_HEADER_LOCK_ACCOUNT', $content['userid']);
-                                               $content['text']   = getMaskedMessage('ADMIN_TEXT_LOCK_ACCOUNT', $content['userid']);
+                                               $content['header'] = '{%message,ADMIN_HEADER_LOCK_ACCOUNT=' . $content['userid'] . '%}';
+                                               $content['text']   = '{%message,ADMIN_TEXT_LOCK_ACCOUNT=' . $content['userid'] . '%}';
                                                break;
 
                                        case 'LOCKED': // Unlock the user
                                                $content['ok']     = 'unlock';
-                                               $content['header'] = getMaskedMessage('ADMIN_HEADER_UNLOCK_ACCOUNT', $content['userid']);
-                                               $content['text']   = getMaskedMessage('ADMIN_TEXT_UNLOCK_ACCOUNT', $content['userid']);
+                                               $content['header'] = '{%message,ADMIN_HEADER_UNLOCK_ACCOUNT=' . $content['userid'] . '%}';
+                                               $content['text']   = '{%message,ADMIN_TEXT_UNLOCK_ACCOUNT=' . $content['userid'] . '%}';
                                                break;
 
                                        case 'UNCONFIRMED': // Unconfirmed accounts cannot be unlocked!
-                                               $content['ok'] = 'delete';
-                                               $content['header'] = getMaskedMessage('ADMIN_HEADER_DELETE_ACCOUNT', $content['userid']);
-                                               $content['text']   = getMaskedMessage('ADMIN_TEXT_DELETE_ACCOUNT', $content['userid']);
+                                               $content['ok']     = 'delete';
+                                               $content['header'] = '{%message,ADMIN_HEADER_DELETE_ACCOUNT=' . $content['userid'] . '%}';
+                                               $content['text']   = '{%message,ADMIN_TEXT_DELETE_ACCOUNT=' . $content['userid'] . '%}';
                                                break;
                                }
 
@@ -148,7 +148,7 @@ LIMIT 1",
                                loadTemplate('admin_lock_user', false, $content);
                        } else {
                                // Account does not exists!
-                               loadTemplate('admin_settings_unsaved', false, getMaskedMessage('ADMIN_MEMBER_404', bigintval(getRequestParameter('userid'))) . '</div>');
+                               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_MEMBER_404=' . bigintval(getRequestParameter('userid')), '%}');
                        }
                }
 
@@ -166,7 +166,7 @@ LIMIT 1",
                }
        } else {
                // Account does not exists!
-               loadTemplate('admin_settings_unsaved', false, getMaskedMessage('ADMIN_MEMBER_404', bigintval(getRequestParameter('userid'))));
+               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_MEMBER_404=' . bigintval(getRequestParameter('userid')), '%}');
        }
 } else {
        // List all users