Vergleich inc/datahandlers/user.php - 1.6.1 - 1.6.13

Keine Änderungen Hinzugefügt Modifiziert Entfernt
Zeile 6	Zeile 6
* Website: http://mybb.com * License: http://mybb.com/about/license *	* Website: http://mybb.com * License: http://mybb.com/about/license *
* $Id: user.php 5172 2010-08-02 23:13:03Z RyanGordon $	* $Id$
*/ // Disallow direct access to this file for security reasons	*/ // Disallow direct access to this file for security reasons
Zeile 70	Zeile 70
// Fix bad characters $username = trim_blank_chrs($username);	// Fix bad characters $username = trim_blank_chrs($username);
$username = str_replace(array(unicode_chr(160), unicode_chr(173), unicode_chr(0xCA), dec_to_utf8(8238), dec_to_utf8(8237), dec_to_utf8(8203)), array(" ", "-", "", "", "", ""), $username);	$username = str_replace(array(unichr(160), unichr(173), unichr(0xCA), dec_to_utf8(8238), dec_to_utf8(8237), dec_to_utf8(8203)), array(" ", "-", "", "", "", ""), $username);
// Remove multiple spaces from the username $username = preg_replace("#\s{2,}#", " ", $username);	// Remove multiple spaces from the username $username = preg_replace("#\s{2,}#", " ", $username);
Zeile 90	Zeile 90
} // Check for certain characters in username (<, >, &, commas and slashes)	} // Check for certain characters in username (<, >, &, commas and slashes)
if(strpos($username, "<") !== false \|\| strpos($username, ">") !== false \|\| strpos($username, "&") !== false \|\| my_strpos($username, "\\") !== false \|\| strpos($username, ";") !== false \|\| strpos($username, ",") !== false)	if(strpos($username, "<") !== false \|\| strpos($username, ">") !== false \|\| strpos($username, "&") !== false \|\| my_strpos($username, "\\") !== false \|\| strpos($username, ";") !== false \|\| strpos($username, ",") !== false \|\| !validate_utf8_string($username, false, false))
{ $this->set_error("bad_characters_username"); return false;	{ $this->set_error("bad_characters_username"); return false;
Zeile 126	Zeile 126
return true; }	return true; }

/** * Verifies if a username is already in use or not. *	/** * Verifies if a username is already in use or not. *
Zeile 136	Zeile 136
{ global $db;	{ global $db;
$username = &$this->data['username']; $uid_check = "";	$username = &$this->data['username']; $uid_check = "";
if($this->data['uid']) { $uid_check = " AND uid!='{$this->data['uid']}'";	if($this->data['uid']) { $uid_check = " AND uid!='{$this->data['uid']}'";
} $query = $db->simple_select("users", "COUNT(uid) AS count", "LOWER(username)='".$db->escape_string(strtolower(trim($username)))."'{$uid_check}");	} $query = $db->simple_select("users", "COUNT(uid) AS count", "LOWER(username)='".$db->escape_string(strtolower(trim($username)))."'{$uid_check}");
$user_count = $db->fetch_field($query, "count"); if($user_count > 0) { $this->set_error("username_exists", array($username)); return true;	$user_count = $db->fetch_field($query, "count"); if($user_count > 0) { $this->set_error("username_exists", array($username)); return true;
}	}
else { return false;	else { return false;
Zeile 160	Zeile 160
/** * Verifies if a new password is valid or not.	/** * Verifies if a new password is valid or not.
* * @return boolean True when valid, false when invalid.	* * @return boolean True when valid, false when invalid.
*/ function verify_password() {	*/ function verify_password() {
Zeile 183	Zeile 183
// First, see if there is one or more complex character(s) in the password. if(!preg_match("/^.(?=.{".$mybb->settings['minpasswordlength'].",})(?=.\d)(?=.[a-z])(?=.[A-Z]).*$/", $user['password'])) {	// First, see if there is one or more complex character(s) in the password. if(!preg_match("/^.(?=.{".$mybb->settings['minpasswordlength'].",})(?=.\d)(?=.[a-z])(?=.[A-Z]).*$/", $user['password'])) {
$this->set_error('no_complex_characters');	$this->set_error('no_complex_characters', array($mybb->settings['minpasswordlength']));
return false; } }	return false; } }
Zeile 196	Zeile 196
} // MD5 the password	} // MD5 the password
$user['md5password'] = md5($user['password']);	$user['md5password'] = md5($user['password']);
// Generate our salt $user['salt'] = generate_salt(); // Combine the password and salt $user['saltedpw'] = salt_password($user['md5password'], $user['salt']);	// Generate our salt $user['salt'] = generate_salt(); // Combine the password and salt $user['saltedpw'] = salt_password($user['md5password'], $user['salt']);

// Generate the user login key $user['loginkey'] = generate_loginkey();	// Generate the user login key $user['loginkey'] = generate_loginkey();
Zeile 212	Zeile 212
/** * Verifies usergroup selections and other group details.	/** * Verifies usergroup selections and other group details.
* * @return boolean True when valid, false when invalid. */	* * @return boolean True when valid, false when invalid. */