Vergleich inc/datahandlers/user.php - 1.6.10 - 1.6.17

Keine Änderungen Hinzugefügt Modifiziert Entfernt
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 138	Zeile 138
$username = &$this->data['username'];	$username = &$this->data['username'];
$uid_check = "";	$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)	$user_count = $db->fetch_field($query, "count"); if($user_count > 0)
{	{
$this->set_error("username_exists", array($username)); return true;	$this->set_error("username_exists", array($username)); return true;
}	}
else { return false; } }	else { return false; } }

/** * Verifies if a new password is valid or not. * * @return boolean True when valid, false when invalid. */ function verify_password()	/** * Verifies if a new password is valid or not. * * @return boolean True when valid, false when invalid. */ function verify_password()
{ global $mybb;	{ global $mybb;
$user = &$this->data; // Always check for the length of the password. if(my_strlen($user['password']) < $mybb->settings['minpasswordlength'] \|\| my_strlen($user['password']) > $mybb->settings['maxpasswordlength'])	$user = &$this->data; // Always check for the length of the password. if(my_strlen($user['password']) < $mybb->settings['minpasswordlength'] \|\| my_strlen($user['password']) > $mybb->settings['maxpasswordlength'])
{	{
$this->set_error('invalid_password_length', array($mybb->settings['minpasswordlength'], $mybb->settings['maxpasswordlength'])); return false; }	$this->set_error('invalid_password_length', array($mybb->settings['minpasswordlength'], $mybb->settings['maxpasswordlength'])); return false; }
Zeile 184	Zeile 184
if(!preg_match("/^.(?=.{".$mybb->settings['minpasswordlength'].",})(?=.\d)(?=.[a-z])(?=.[A-Z]).*$/", $user['password'])) { $this->set_error('no_complex_characters', array($mybb->settings['minpasswordlength']));	if(!preg_match("/^.(?=.{".$mybb->settings['minpasswordlength'].",})(?=.\d)(?=.[a-z])(?=.[A-Z]).*$/", $user['password'])) { $this->set_error('no_complex_characters', array($mybb->settings['minpasswordlength']));
return false; }	return false; }
} // If we have a "password2" check if they both match	} // If we have a "password2" check if they both match
Zeile 194	Zeile 194
$this->set_error("passwords_dont_match"); return false; }	$this->set_error("passwords_dont_match"); return false; }

// MD5 the password $user['md5password'] = md5($user['password']);	// MD5 the 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 240	Zeile 240
// Check if this is a proper email address. if(!validate_email_format($user['email']))	// Check if this is a proper email address. if(!validate_email_format($user['email']))
{	{