Compilation time added, some compileCode() calles removed, ADMIN_WHAT_404 added

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

diff --git a/inc/modules/chk_login.php b/inc/modules/chk_login.php
index 526da23c4d86f75eefee601d38d57f1e67494717..3014e87d8d85c3bbf9e6589e4cb5f270e78eabf1 100644 (file)
--- a/inc/modules/chk_login.php
+++ b/inc/modules/chk_login.php
@@ -47,23 +47,14 @@ $message = "<strong>{--VALIDATING_LOGIN--}</strong>";
 if (isUserIdSet() && (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?
-               $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(getUserId())) {
+                       // Userid is not valid
+                       debug_report_bug('User id '.getUserId() . ' 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']);
@@ -71,9 +62,13 @@ if (isUserIdSet() && (isSessionVariableSet('u_hash'))) {
                // Remmeber login failures if available
                if (getExtensionVersion('sql_patches') >= '0.6.1') {
                        // Reset login failures
-                       SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data`
-SET `login_failures`=0, `last_failure`='0000-00-00 00:00:00'
-WHERE `userid`=%s
+                       SQL_QUERY_ESC("UPDATE
+       `{?_MYSQL_PREFIX?}_user_data`
+SET
+       `login_failures`=0,
+       `last_failure`='0000-00-00 00:00:00'
+WHERE
+       `userid`=%s
 LIMIT 1",
                                array(getUserId()), __FILE__, __LINE__);
 
@@ -87,14 +82,18 @@ LIMIT 1",
        $bonus = false;
        if ((getExtensionVersion('sql_patches') >= '0.2.8') && (getExtensionVersion('bonus') >= '0.2.1') && (getConfig('bonus_login_yn') == 'Y')) {
                // Update last login if far enougth away
-               SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data`
-SET `last_login`=UNIX_TIMESTAMP()
-WHERE `userid`=%s AND `last_login` < (UNIX_TIMESTAMP() - %s)
+               SQL_QUERY_ESC("UPDATE
+       `{?_MYSQL_PREFIX?}_user_data`
+SET
+       `last_login`=UNIX_TIMESTAMP()
+WHERE
+       `userid`=%s AND
+       `last_login` < (UNIX_TIMESTAMP() - %s)
 LIMIT 1",
-               array(
-                       getUserId(),
-                       getConfig('login_timeout')
-               ), __FILE__, __LINE__
+                       array(
+                               getUserId(),
+                               getConfig('login_timeout')
+                       ), __FILE__, __LINE__
                );
                if (SQL_AFFECTEDROWS() == 1) $bonus = true;
        } // END - if