Fix for the fix

[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 c418df55cb625f90d68c6ac341ab2492ab70cdf0..83455cbe47d8ce37bf3461452968d82862710a13 100644 (file)
--- a/inc/modules/admin/what-lock_user.php
+++ b/inc/modules/admin/what-lock_user.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 09/28/2003 *
- * ===============                              Last change: 06/10/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 09/28/2003 *
+ * ===================                          Last change: 06/10/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : what-lock_user.php                               *
@@ -46,13 +46,13 @@ addMenuDescription('admin', __FILE__);
 
 // Is a userid set?
 if (isGetRequestElementSet('userid')) {
-       // 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",
-               array(bigintval(getRequestElement('userid'))), __FILE__, __LINE__);
+       // Action not performed by default
        $ACT = false;
-       if (SQL_NUMROWS($result_user) == 1) {
+
+       // 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
@@ -120,23 +120,16 @@ LIMIT 1",
                        $URL = adminCreateUserLink(getRequestElement('userid'));
                } else {
                        // Load user data we need
-                       $result = SQL_QUERY_ESC("SELECT `email`, `surname`, `family` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid`=%s LIMIT 1",
-                               array(bigintval(getRequestElement('userid'))), __FILE__, __LINE__);
-
-                       // Entry found?
-                       if (SQL_NUMROWS($result) == 1) {
-                               // Load data
-                               $DATA = SQL_FETCHARRAY($result);
-
+                       if (fetchUserData(getRequestElement('userid'))) {
                                // Transfer data to constants for the template
-                               // @TODO Rewrite these all constants
-                               $content['email']   = generateEmailLink($DATA['email'], 'user_data');
-                               $content['surname'] = $DATA['surname'];
-                               $content['family']  = $DATA['family'];
+                               $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']);
@@ -156,15 +149,15 @@ LIMIT 1",
                                                break;
                                }
 
+                               // Translate user status
+                               $content['status'] = translateUserStatus($content['status']);
+
                                // Output form
                                loadTemplate('admin_lock_user', false, $content);
                        } else {
                                // Account does not exists!
                                loadTemplate('admin_settings_saved', false, "<div class=\"admin_failed\">".sprintf(getMessage('ADMIN_MEMBER_404'), getRequestElement('userid'))."</div>");
                        }
-
-                       // Free result
-                       SQL_FREERESULT($result);
                }
 
                // Is an URL set?
@@ -183,9 +176,6 @@ LIMIT 1",
                // Account does not exists!
                loadTemplate('admin_settings_saved', false, "<div class=\"admin_failed\">".sprintf(getMessage('ADMIN_MEMBER_404'), getRequestElement('userid'))."</div>");
        }
-
-       // Free result
-       SQL_FREERESULT($result_user);
 } else {
        // List all users
        addMemberSelectionBox();