Some global variables rewritten, a lot more language constants rewritten to getMessage()

[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 8cae8cbff328864ac88dec4a1b80d11223691311..b790d0224f2d52648ff17a86334a88b4e16cb5e6 100644 (file)
--- a/inc/modules/admin/what-lock_user.php
+++ b/inc/modules/admin/what-lock_user.php
@@ -81,7 +81,7 @@ if (REQUEST_ISSET_GET(('uid'))) {
                        } // END - if
 
                        // Prepare message
-                       $MSG = USER_ACCOUNT_LOCKED_1.REQUEST_GET('uid').USER_ACCOUNT_LOCKED_2;
+                       $MSG = sprintf(getMessage('USER_ACCOUNT_LOCKED'), REQUEST_GET('uid'));
                        $ACT = true;
                } elseif ((REQUEST_ISSET_POST(('unlock'))) && ($status == "LOCKED")) {
                        // Ok, unlock the account!
@@ -108,7 +108,7 @@ if (REQUEST_ISSET_GET(('uid'))) {
                        } // END - if
 
                        // Prepare message
-                       $MSG = USER_ACCOUNT_UNLOCKED_1.REQUEST_GET('uid').USER_ACCOUNT_UNLOCKED_2;
+                       $MSG = sprintf(getMessage('USER_ACCOUNT_UNLOCKED'), REQUEST_GET('uid'));
                        $ACT = true;
                } elseif (REQUEST_ISSET_POST('del')) {
                        // Delete the account
@@ -116,7 +116,7 @@ if (REQUEST_ISSET_GET(('uid'))) {
                        LOAD_INC_ONCE("inc/modules/admin/what-del_user.php");
                } elseif (REQUEST_ISSET_POST(('no'))) {
                        // Do not lock him...
-                       $URL = "modules.php?module=admin&what=list_user&uid=".bigintval(REQUEST_GET('uid'));
+                       $URL = ADMIN_CREATE_USERID_LINK(REQUEST_GET('uid'));
                } else {
                        $result = SQL_QUERY_ESC("SELECT email, surname, family FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
                                array(bigintval(REQUEST_GET('uid'))), __FILE__, __LINE__);
@@ -130,6 +130,7 @@ if (REQUEST_ISSET_GET(('uid'))) {
                                SQL_FREERESULT($result);
 
                                // Transfer data to constants for the template
+                               // @TODO Rewrite these all constants
                                define('__EMAIL', CREATE_EMAIL_LINK($email, "user_data"));
                                define('__SNAME', $sname);
                                define('__FNAME', $fname);
@@ -140,20 +141,20 @@ if (REQUEST_ISSET_GET(('uid'))) {
                                {
                                case "CONFIRMED": // Yes, lock him down... ;-)
                                        define('__OK_VALUE'    , "lock");
-                                       define('__HEADER_VALUE', ADMIN_HEADER_LOCK_ACCOUNT_1.__UID.ADMIN_HEADER_LOCK_ACCOUNT_2);
-                                       define('__TEXT_VALUE'  , ADMIN_TEXT_LOCK_ACCOUNT_1.__UID.ADMIN_TEXT_LOCK_ACCOUNT_2);
+                                       define('__HEADER_VALUE', sprintf(getMessage('ADMIN_HEADER_LOCK_ACCOUNT'), constant('__UID')));
+                                       define('__TEXT_VALUE'  , sprintf(getMessage('ADMIN_TEXT_LOCK_ACCOUNT'), constant('__UID')));
                                        break;
 
                                case "LOCKED": // Unlock the user
                                        define('__OK_VALUE'    , "unlock");
-                                       define('__HEADER_VALUE', ADMIN_HEADER_UNLOCK_ACCOUNT_1.__UID.ADMIN_HEADER_UNLOCK_ACCOUNT_2);
-                                       define('__TEXT_VALUE'  , ADMIN_TEXT_UNLOCK_ACCOUNT_1.__UID.ADMIN_TEXT_UNLOCK_ACCOUNT_2);
+                                       define('__HEADER_VALUE', sprintf(getMessage('ADMIN_HEADER_UNLOCK_ACCOUNT'), constant('__UID')));
+                                       define('__TEXT_VALUE'  , sprintf(getMessage('ADMIN_TEXT_UNLOCK_ACCOUNT'), constant('__UID')));
                                        break;
 
                                case "UNCONFIRMED": // Unconfirmed accounts cannot be unlocked!
                                        define('__OK_VALUE'    , "del");
-                                       define('__HEADER_VALUE', ADMIN_HEADER_DEL_ACCOUNT_1.__UID.ADMIN_HEADER_DEL_ACCOUNT_2);
-                                       define('__TEXT_VALUE'  , ADMIN_TEXT_DEL_ACCOUNT_1.__UID.ADMIN_TEXT_DEL_ACCOUNT_2);
+                                       define('__HEADER_VALUE', sprintf(getMessage('ADMIN_HEADER_DEL_ACCOUNT'), constant('__UID')));
+                                       define('__TEXT_VALUE'  , sprintf(getMessage('ADMIN_TEXT_DEL_ACCOUNT'), constant('__UID')));
                                        break;
                                }