Yet another fix for missing 'def_refid' in install 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 bf998d8863acf4d0b97d7d1a335b13dfe86e7492..8c1aacad42f7532102d984fc30161974051ca752 100644 (file)
--- a/inc/modules/admin/what-lock_user.php
+++ b/inc/modules/admin/what-lock_user.php
@@ -46,28 +46,22 @@ 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) {
-               // User found
-               list($status, $gender, $surname, $family, $email) = SQL_FETCHROW($result_user);
-
-               // Free result
-               SQL_FREERESULT($result_user);
 
+       // Load user's data
+       if (fetchUserData(getRequestElement('userid'))) {
                // Is a lock reason set?
                if ((isPostRequestElementSet('lock')) && ($status != 'LOCKED')) {
                        // Ok, lock the account!
                        if (getExtensionVersion('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",
-                               array(postRequestElement('reason'), bigintval(getRequestElement('userid'))), __FILE__, __LINE__);
+                               SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `status`='LOCKED', `lock_reason`='%s', `lock_timestamp`=NOW() WHERE `userid`=%s LIMIT 1",
+                                       array(postRequestElement('reason'), bigintval(getRequestElement('userid'))), __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",
-                               array(bigintval(getRequestElement('userid'))), __FILE__, __LINE__);
+                                       array(bigintval(getRequestElement('userid'))), __FILE__, __LINE__);
                        }
 
                        // Entry updated?
@@ -76,7 +70,7 @@ if (isGetRequestElementSet('userid')) {
                                $message = loadEmailTemplate('lock-user', array('text' => postRequestElement('reason')), bigintval(getRequestElement('userid')));
 
                                // Send away...
-                               sendEmail(bigintval(getRequestElement('userid')), ADMIN_LOCKED_SUBJ, $message);
+                               sendEmail(bigintval(getRequestElement('userid')), getMessage('ADMIN_LOCKED_SUBJ'), $message);
                        } // END - if
 
                        // Prepare message
@@ -126,19 +120,11 @@ 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['fname']   = $DATA['family'];
+                               $content['email']   = generateEmailLink(getUserData('email'), 'user_data');
+                               $content['surname'] = getUserData('surname');
+                               $content['family']  = getUserData('family');
                                $content['userid']  = bigintval(getRequestElement('userid'));
 
                                // Realy want to lock?
@@ -168,9 +154,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);
                }
 
                // Is an URL set?
@@ -194,5 +177,5 @@ LIMIT 1",
        addMemberSelectionBox();
 }
 
-//
+// [EOF]
 ?>