Huge rewrite:

[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 435e1e1835b072e8fcaafbd26e2a0282f9de1433..06bdeca12023ee2952b7eb0ff06081930c24ca95 100644 (file)
--- a/inc/modules/admin/what-lock_user.php
+++ b/inc/modules/admin/what-lock_user.php
@@ -74,10 +74,10 @@ if (REQUEST_ISSET_GET('uid')) {
                        // Entry updated?
                        if (SQL_AFFECTEDROWS() == 1) {
                                // Send an email to the user! In later version you can optionally switch this feature off
-                               $msg = LOAD_EMAIL_TEMPLATE("lock-user", array('text' => REQUEST_POST('reason')), bigintval(REQUEST_GET('uid')));
+                               $message = LOAD_EMAIL_TEMPLATE('lock-user', array('text' => REQUEST_POST('reason')), bigintval(REQUEST_GET('uid')));
 
                                // Send away...
-                               sendEmail(bigintval(REQUEST_GET('uid')), ADMIN_LOCKED_SUBJ, $msg);
+                               sendEmail(bigintval(REQUEST_GET('uid')), ADMIN_LOCKED_SUBJ, $message);
                        } // END - if
 
                        // Prepare message
@@ -87,21 +87,29 @@ if (REQUEST_ISSET_GET('uid')) {
                        // 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",
-                               array(bigintval(REQUEST_GET('uid'))), __FILE__, __LINE__);
+                               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(REQUEST_GET('uid'))), __FILE__, __LINE__);
                        } else {
                                // No lock reason to reset
-                               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET `status`='CONFIRMED' WHERE userid=%s LIMIT 1",
-                               array(bigintval(REQUEST_GET('uid'))), __FILE__, __LINE__);
+                               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET `status`='CONFIRMED' WHERE `userid`=%s LIMIT 1",
+                                       array(bigintval(REQUEST_GET('uid'))), __FILE__, __LINE__);
                        }
 
                        // Entry updated?
                        if (SQL_AFFECTEDROWS() == 1) {
                                // Send an email to the user! In later version you can optionally switch this feature off
-                               $msg = LOAD_EMAIL_TEMPLATE("unlock-user", array('text' => REQUEST_POST('reason')), bigintval(REQUEST_GET('uid')));
+                               $message = LOAD_EMAIL_TEMPLATE('unlock-user', array('text' => REQUEST_POST('reason')), bigintval(REQUEST_GET('uid')));
 
                                // Send away...
-                               sendEmail(bigintval(REQUEST_GET('uid')), getMessage('ADMIN_UNLOCKED_SUBJ'), $msg);
+                               sendEmail(bigintval(REQUEST_GET('uid')), getMessage('ADMIN_UNLOCKED_SUBJ'), $message);
                                if (EXT_IS_ACTIVE('rallye')) {
                                        RALLYE_AUTOADD_USER(REQUEST_GET('uid'));
                                } // END - if
@@ -113,27 +121,25 @@ if (REQUEST_ISSET_GET('uid')) {
                } elseif (REQUEST_ISSET_POST('del')) {
                        // Delete the account
                        $ACT = true;
-                       loadIncludeOnce("inc/modules/admin/what-del_user.php");
+                       loadIncludeOnce('inc/modules/admin/what-del_user.php');
                } elseif (REQUEST_ISSET_POST('no')) {
                        // Do not lock him...
                        $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",
+                       // 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(REQUEST_GET('uid'))), __FILE__, __LINE__);
 
                        // Entry found?
                        if (SQL_NUMROWS($result) == 1) {
                                // Load data
-                               list ($email, $sname, $fname) = SQL_FETCHROW($result);
-
-                               // Free result
-                               SQL_FREERESULT($result);
+                               $DATA = SQL_FETCHARRAY($result);
 
                                // Transfer data to constants for the template
                                // @TODO Rewrite these all constants
-                               define('__EMAIL', generateEmailLink($email, 'user_data'));
-                               define('__SNAME', $sname);
-                               define('__FNAME', $fname);
+                               define('__EMAIL', generateEmailLink($DATA['email'], 'user_data'));
+                               define('__SNAME', $DATA['surname']);
+                               define('__FNAME', $DATA['family']);
                                define('__UID'  , bigintval(REQUEST_GET('uid')));
 
                                // Realy want to lock?
@@ -164,6 +170,9 @@ if (REQUEST_ISSET_GET('uid')) {
                                // Account does not exists!
                                LOAD_TEMPLATE('admin_settings_saved', false, "<div class=\"admin_failed\">".sprintf(getMessage('ADMIN_MEMBER_404'), REQUEST_GET('uid'))."</div>");
                        }
+
+                       // Free result
+                       SQL_FREERESULT($result);
                }
 
                // Is an URL set?