X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Fuser_functions.php;h=75861062de939c864b922b2aa1e5398816cf4c53;hp=45198007823541cd841a0add808b69f6fd34733a;hb=66b91ce490ab549425619c95fc12086e126d541b;hpb=cc733388b318c319520c42680595155256340e57 diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php index 4519800782..75861062de 100644 --- a/inc/libs/user_functions.php +++ b/inc/libs/user_functions.php @@ -58,7 +58,7 @@ function alpha ($sortby, $colspan, $return=false) { $OUT .= "".$ltr.""; } else { // Output link to letter - $OUT .= "".$ltr.""; } @@ -116,7 +116,7 @@ function SortLinks ($letter, $sortby, $colspan, $return=false) { if ($sortby == $sort) { $OUT .= "" . $title . " | "; } else { - $OUT .= "" . $title . " | "; + $OUT .= "" . $title . " | "; } } // END - foreach @@ -154,7 +154,7 @@ function ADD_PAGENAV ($PAGES, $offset, $show_form, $colspan,$return=false) { if (!REQUEST_ISSET_GET('sortby')) REQUEST_SET_GET('sortby', 'userid'); // Base link - $OUT .= '= '0.2.8') { - $lastOnline = ', last_login'; + $lastOnline = ', `last_login`'; } // END - if // Init array @@ -275,77 +275,79 @@ function USER_DO_LOGIN ($uid, $passwd) { 'last_online' => 0, 'last_login' => 0, 'hash' => '' - ); + ); - // Check login data - if ((EXT_IS_ACTIVE('nickname')) && (NICKNAME_IS_ACTIVE($uid))) { - // Nickname entered - $result = SQL_QUERY_ESC("SELECT `userid`, `password`, `last_online`" . $lastOnline . " FROM `{!_MYSQL_PREFIX!}_user_data` WHERE `nickname`='%s' AND `status`='CONFIRMED' LIMIT 1", - array($uid), __FUNCTION__, __LINE__); + // Check login data + if ((EXT_IS_ACTIVE('nickname')) && (NICKNAME_IS_ACTIVE($uid))) { + // Nickname entered + $result = SQL_QUERY_ESC("SELECT `userid`, `password`, `last_online`" . $lastOnline . " FROM `{!_MYSQL_PREFIX!}_user_data` WHERE `nickname`='%s' AND `status`='CONFIRMED' LIMIT 1", + array($uid), __FUNCTION__, __LINE__); + } else { + // Direct userid entered + $result = SQL_QUERY_ESC("SELECT `userid`, `password`, `last_online`" . $lastOnline . " FROM `{!_MYSQL_PREFIX!}_user_data` WHERE `userid`=%s AND `status`='CONFIRMED' LIMIT 1", + array($uid, $content['hash']), __FUNCTION__, __LINE__); + } + + // Load entry + $content = SQL_FETCHARRAY($result); + if (!empty($content['userid'])) $uid = bigintval($content['userid']); + + // Is there an entry? + if ((SQL_NUMROWS($result) == 1) && ((isNicknameUsed($content['userid'] === true) && (!empty($content['userid']))) || ($content['userid'] == $uid))) { + // Free result + SQL_FREERESULT($result); + + // Check for old MD5 passwords + if ((strlen($content['password']) == 32) && (md5($passwd) == $content['password'])) { + // Just set the hash to the password from DB... :) + $content['hash'] = $content['password']; } else { - // Direct userid entered - $result = SQL_QUERY_ESC("SELECT `userid`, `password`, `last_online`" . $lastOnline . " FROM `{!_MYSQL_PREFIX!}_user_data` WHERE `userid`=%s AND `status`='CONFIRMED' LIMIT 1", - array($uid, $content['hash']), __FUNCTION__, __LINE__); + // Hash password with improved way for comparsion + $content['hash'] = generateHash($passwd, substr($content['password'], 0, -40)); } - // Load entry - $content = SQL_FETCHARRAY($result); - if (!empty($content['userid'])) $uid = bigintval($content['userid']); + // Does the password match the hash? + if ($content['hash'] == $content['password']) { + // New hashed password found so let's generate a new one + $content['hash'] = generateHash($passwd); + + // ... and update database + // @TODO Make this filter working: $ADDON = runFilterChain('post_login_update', $content); + SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET `password`='%s' WHERE `userid`=%s AND `status`='CONFIRMED' LIMIT 1", + array($content['hash'], $uid), __FUNCTION__, __LINE__); + + // No login bonus by default + $GLOBALS['bonus_payed'] = false; + + // Probe for last online timemark + $probe = time() - $content['last_online']; + if (!empty($content['last_login'])) $probe = time() - $content['last_login']; + if ((GET_EXT_VERSION('bonus') >= '0.2.2') && ($probe >= getConfig('login_timeout'))) { + // Add login bonus to user's account + $add = sprintf(", `login_bonus`=`login_bonus`+%s", + (float)getConfig('login_bonus') + ); + $GLOBALS['bonus_payed'] = true; + + // Subtract login bonus from userid's account or jackpot + if ((GET_EXT_VERSION('bonus') >= '0.3.5') && (getConfig('bonus_mode') != 'ADD')) BONUS_POINTS_HANDLER('login_bonus'); + } // END - if - // Is there an entry? - if ((SQL_NUMROWS($result) == 1) && ((isNicknameUsed($content['userid'] === true) && (!empty($content['userid']))) || ($content['userid'] == $uid))) { - // Free result - SQL_FREERESULT($result); + // Calculate new hash with the secret key and master salt together + $content['hash'] = generatePassString($content['hash']); - // Check for old MD5 passwords - if ((strlen($content['password']) == 32) && (md5($passwd) == $content['password'])) { - // Just set the hash to the password from DB... :) - $content['hash'] = $content['password']; - } else { - // Hash password with improved way for comparsion - $content['hash'] = generateHash($passwd, substr($content['password'], 0, -40)); - } + // Update global array + // @TODO Make this filter working: $URL = runFilterChain('do_login', array('content' => $content, 'addon' => $ADDON)); + setUserId($uid); - // Does the password match the hash? - if ($content['hash'] == $content['password']) { - // New hashed password found so let's generate a new one - $content['hash'] = generateHash($passwd); - - // ... and update database - // @TODO Make this filter working: $ADDON = runFilterChain('post_login_update', $content); - SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET `password`='%s' WHERE `userid`=%s AND `status`='CONFIRMED' LIMIT 1", - array($content['hash'], $uid), __FUNCTION__, __LINE__); - - // No login bonus by default - $GLOBALS['bonus_payed'] = false; - - // Probe for last online timemark - $probe = time() - $content['last_online']; - if (!empty($content['last_login'])) $probe = time() - $content['last_login']; - if ((GET_EXT_VERSION('bonus') >= '0.2.2') && ($probe >= getConfig('login_timeout'))) { - // Add login bonus to user's account - $add = sprintf(", `login_bonus`=`login_bonus`+%s", - (float)getConfig('login_bonus') - ); - $GLOBALS['bonus_payed'] = true; - - // Subtract login bonus from userid's account or jackpot - if ((GET_EXT_VERSION('bonus') >= '0.3.5') && (getConfig('bonus_mode') != 'ADD')) BONUS_POINTS_HANDLER('login_bonus'); - } // END - if - - // Calculate new hash with the secret key and master salt together - $content['hash'] = generatePassString($content['hash']); - - // Update global array - // @TODO Make this filter working: $URL = runFilterChain('do_login', array('content' => $content, 'addon' => $ADDON)); - setUserId($uid); - - // Try to set session data (which shall normally always work!) - if ((setSession('userid', $uid )) && (setSession('u_hash', $content['hash']))) { - // Update database records - SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET `total_logins`=`total_logins`+1" . $add . " WHERE `userid`=%s LIMIT 1", - array($uid), __FUNCTION__, __LINE__); - if (SQL_AFFECTEDROWS() == 1) { + // Try to set session data (which shall normally always work!) + if ((setSession('userid', $uid )) && (setSession('u_hash', $content['hash']))) { + // Update database records + SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET `total_logins`=`total_logins`+1" . $add . " WHERE `userid`=%s LIMIT 1", + array($uid), __FUNCTION__, __LINE__); + if (SQL_AFFECTEDROWS() == 1) { + // Is a success URL set? + if (empty($successUrl)) { // Procedure to checking for login data if (($GLOBALS['bonus_payed']) && (EXT_IS_ACTIVE('bonus'))) { // Bonus added (just displaying!) @@ -355,48 +357,52 @@ function USER_DO_LOGIN ($uid, $passwd) { $URL = 'modules.php?module=chk_login&mode=login'; } } else { - // Cannot update counter! - $URL = 'modules.php?module=index&what=login&login='.getCode('CNTR_FAILED'); + // Use this URL + $URL = $successUrl; } } else { - // Cookies not setable! - $URL = 'modules.php?module=index&what=login&login='.getCode('NO_COOKIES'); + // Cannot update counter! + $URL = 'modules.php?module=index&what=login&login='.getCode('CNTR_FAILED'); } - } elseif (GET_EXT_VERSION('sql_patches') >= '0.6.1') { - // Update failture counter - SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET `login_failures`=`login_failures`+1,`last_failure`=NOW() WHERE `userid`=%s LIMIT 1", - array($uid), __FUNCTION__, __LINE__); - - // Wrong password! - $URL = 'modules.php?module=index&what=login&login='.getCode('WRONG_PASS'); - } - } elseif (((isNicknameUsed($content['userid'])) && (!empty($content['userid']))) || ($content['userid'] == $uid)) { - // Other account status? - // @TODO Can this query be merged with above query? - $result = SQL_QUERY_ESC("SELECT status FROM `{!_MYSQL_PREFIX!}_user_data` WHERE `userid`=%s LIMIT 1", - array($uid), __FUNCTION__, __LINE__); - - // Entry found? - if (SQL_NUMROWS($result) == 1) { - // Load status - list($status) = SQL_FETCHROW($result); - - // Create an error code from given status - $errorCode = generateErrorCodeFromUserStatus($status); } else { - // ID not found! - $errorCode = getCode('WRONG_ID'); + // Cookies not setable! + $URL = 'modules.php?module=index&what=login&login='.getCode('NO_COOKIES'); } + } elseif (GET_EXT_VERSION('sql_patches') >= '0.6.1') { + // Update failture counter + SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET `login_failures`=`login_failures`+1,`last_failure`=NOW() WHERE `userid`=%s LIMIT 1", + array($uid), __FUNCTION__, __LINE__); - // Construct URL - $URL = 'modules.php?module=index&what=login&login='.$errorCode; + // Wrong password! + $URL = 'modules.php?module=index&what=login&login='.getCode('WRONG_PASS'); + } + } elseif (((isNicknameUsed($content['userid'])) && (!empty($content['userid']))) || ($content['userid'] == $uid)) { + // Other account status? + // @TODO Can this query be merged with above query? + $result = SQL_QUERY_ESC("SELECT status FROM `{!_MYSQL_PREFIX!}_user_data` WHERE `userid`=%s LIMIT 1", + array($uid), __FUNCTION__, __LINE__); + + // Entry found? + if (SQL_NUMROWS($result) == 1) { + // Load status + list($status) = SQL_FETCHROW($result); + + // Create an error code from given status + $errorCode = generateErrorCodeFromUserStatus($status); } else { // ID not found! - $URL = 'modules.php?module=index&what=login&login='.getCode('WRONG_ID'); + $errorCode = getCode('WRONG_ID'); } - // Return URL - return $URL; + // Construct URL + $URL = 'modules.php?module=index&what=login&login='.$errorCode; + } else { + // ID not found! + $URL = 'modules.php?module=index&what=login&login='.getCode('WRONG_ID'); + } + + // Return URL + return $URL; } // Try to send a new password for the given user account