- // Init variables
- $login = false;
-
- // Calculate new hash with the secret key and master salt together
- $hash = generatePassString($hash);
-
- // Update global array
- // @TODO Make this filter working: $URL = RUN_FILTER('do_login', array('uid' => $uid, 'hash' => $hash, 'addon' => $ADDON));
- $GLOBALS['userid'] = $uid;
-
- // Try to set session data (which shall normally always work!)
- if ((set_session('userid', $uid )) && (set_session('u_hash', $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), __FILE__, __LINE__);
- if (SQL_AFFECTEDROWS() == 1) {
- // Procedure to checking for login data
- if (($BONUS) && (EXT_IS_ACTIVE("bonus"))) {
- // Bonus added (just displaying!)
- $URL = "modules.php?module=chk_login&mode=bonus";
+ // 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));
+ }
+
+ // 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) {
+ // Procedure to checking for login data
+ if (($GLOBALS['bonus_payed']) && (EXT_IS_ACTIVE('bonus'))) {
+ // Bonus added (just displaying!)
+ $URL = 'modules.php?module=chk_login&mode=bonus';
+ } else {
+ // Bonus not added
+ $URL = 'modules.php?module=chk_login&mode=login';
+ }