Some more rewrites and fix for countPostSelection()

[mailer.git] / inc / modules / chk_login.php

diff --git a/inc/modules/chk_login.php b/inc/modules/chk_login.php
index bf3ac6071379f57c82e2a86268428c2ce8868075..d02817258a48a17521308d0efbab02aa806d2492 100644 (file)
--- a/inc/modules/chk_login.php
+++ b/inc/modules/chk_login.php
@@ -44,27 +44,18 @@ if (!defined('__SECURITY')) {
 // Initial message part
 $message = "<strong>{--VALIDATING_LOGIN--}</strong>";
 
-if (isUserIdSet() && (isSessionVariableSet('u_hash'))) {
+// Is the member id and u_hash set?
+if (isMemberIdSet() && (isSessionVariableSet('u_hash'))) {
        // Is 'theme' installed and activated?
        if (isExtensionActive('theme')) {
-               // Login failures are supported since 0.4.7
-               // Do we have 0.4.7 of sql_patches or later?
-               // @TODO Rewrite this into a filter
-               $add = '';
-               if (getExtensionVersion('sql_patches') >= '0.6.1') {
-                       // Load them here
-                       $add = ", `login_failures`, UNIX_TIMESTAMP(`last_failure`) AS last_failure";
-               } // END - if
-
                // Get theme from profile
-               $result = SQL_QUERY_ESC("SELECT `curr_theme`".$add." FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid`=%s LIMIT 1",
-                       array(getUserId()), __FILE__, __LINE__);
+               if (!fetchUserData(getMemberId())) {
+                       // Userid is not valid
+                       debug_report_bug('User id '.getMemberId() . ' is invalid.');
+               } // END - if
 
                // Load data
-               $data = SQL_FETCHARRAY($result);
-
-               // Free result
-               SQL_FREERESULT($result);
+               $data = getUserDataArray();
 
                // Change to new theme
                setTheme($data['curr_theme']);
@@ -80,7 +71,7 @@ SET
 WHERE
        `userid`=%s
 LIMIT 1",
-                               array(getUserId()), __FILE__, __LINE__);
+                               array(getMemberId()), __FILE__, __LINE__);
 
                        // Store it in session
                        setSession('mxchange_member_failures', $data['login_failures']);
@@ -101,7 +92,7 @@ WHERE
        `last_login` < (UNIX_TIMESTAMP() - %s)
 LIMIT 1",
                        array(
-                               getUserId(),
+                               getMemberId(),
                                getConfig('login_timeout')
                        ), __FILE__, __LINE__
                );