X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fchk_login.php;h=3014e87d8d85c3bbf9e6589e4cb5f270e78eabf1;hb=16de7d9e8b98108627db01688bc095240b5ba8d2;hp=bf3ac6071379f57c82e2a86268428c2ce8868075;hpb=205769111aba361c7aa76a6b9791bffed1372241;p=mailer.git diff --git a/inc/modules/chk_login.php b/inc/modules/chk_login.php index bf3ac60713..3014e87d8d 100644 --- a/inc/modules/chk_login.php +++ b/inc/modules/chk_login.php @@ -47,24 +47,14 @@ $message = "{--VALIDATING_LOGIN--}"; 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? - // @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(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']);