Previous fix fixed, a lot constants rewritten (unfinished)

[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 2191cef1ceca9748965e3971ab8bd3d3d4a00bae..435ab833435081418fbe8ad9d65c89bdb542b702 100644 (file)
--- a/inc/modules/admin/what-lock_user.php
+++ b/inc/modules/admin/what-lock_user.php
@@ -43,7 +43,7 @@ ADD_DESCR("admin", __FILE__);
 // Is a userid set?
 if (!empty($_GET['u_id'])) {
        // Load user's data
-       $result_user = SQL_QUERY_ESC("SELECT status, gender, surname, family, email FROM `{!MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
+       $result_user = SQL_QUERY_ESC("SELECT status, gender, surname, family, email FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
         array(bigintval($_GET['u_id'])), __FILE__, __LINE__);
        $ACT = false;
        if (SQL_NUMROWS($result_user) == 1) {
@@ -58,11 +58,11 @@ if (!empty($_GET['u_id'])) {
                        // Ok, lock the account!
                        if (GET_EXT_VERSION("user") >= "0.3.5") {
                                // Lock with reason
-                               SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_user_data` SET status='LOCKED',lock_reason='%s',lock_timestamp=NOW() WHERE userid=%s LIMIT 1",
+                               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET status='LOCKED',lock_reason='%s',lock_timestamp=NOW() WHERE userid=%s LIMIT 1",
                                        array($_POST['reason'], bigintval($_GET['u_id'])), __FILE__, __LINE__);
                        } else {
                                // Lock with no lock reason saved
-                               SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_user_data` SET status='LOCKED' WHERE userid=%s LIMIT 1",
+                               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET status='LOCKED' WHERE userid=%s LIMIT 1",
                                        array(bigintval($_GET['u_id'])), __FILE__, __LINE__);
                        }
 
@@ -82,11 +82,11 @@ if (!empty($_GET['u_id'])) {
                        // Ok, unlock the account!
                        if (GET_EXT_VERSION("user") >= "0.3.5") {
                                // Reset lock reason as well
-                               SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_user_data` SET status='CONFIRMED',lock_reason='',lock_timestamp='0000-00-00 00:00' WHERE userid=%s LIMIT 1",
+                               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET status='CONFIRMED',lock_reason='',lock_timestamp='0000-00-00 00:00' WHERE userid=%s LIMIT 1",
                                        array(bigintval($_GET['u_id'])), __FILE__, __LINE__);
                        } else {
                                // No lock reason to reset
-                               SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_user_data` SET status='CONFIRMED' WHERE userid=%s LIMIT 1",
+                               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET status='CONFIRMED' WHERE userid=%s LIMIT 1",
                                        array(bigintval($_GET['u_id'])), __FILE__, __LINE__);
                        }
 
@@ -96,7 +96,7 @@ if (!empty($_GET['u_id'])) {
                                $msg = LOAD_EMAIL_TEMPLATE("unlock-user", array('text' => $_POST['reason']), bigintval($_GET['u_id']));
 
                                // Send away...
-                               SEND_EMAIL(bigintval($_GET['u_id']), ADMIN_UNLOCKED_SUBJ, $msg);
+                               SEND_EMAIL(bigintval($_GET['u_id']), getMessage('ADMIN_UNLOCKED_SUBJ'), $msg);
                                if (EXT_IS_ACTIVE("rallye")) {
                                        RALLYE_AUTOADD_USER($_GET['u_id']);
                                } // END - if
@@ -113,7 +113,7 @@ if (!empty($_GET['u_id'])) {
                        // Do not lock him...
                        $URL = "modules.php?module=admin&what=list_user&u_id=".bigintval($_GET['u_id']);
                } else {
-                       $result = SQL_QUERY_ESC("SELECT email, surname, family FROM `{!MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
+                       $result = SQL_QUERY_ESC("SELECT email, surname, family FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
                                array(bigintval($_GET['u_id'])), __FILE__, __LINE__);
 
                        // Entry found?
@@ -169,7 +169,7 @@ if (!empty($_GET['u_id'])) {
                        if (!empty($MSG)) {
                                LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"admin_green\">".$MSG."</div>");
                        } else {
-                               LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"admin_green\">".ADMIN_USER_UPDATED."</div>");
+                               LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"admin_green\">".getMessage('ADMIN_USER_UPDATED')."</div>");
                        }
                }
        } else {