Vergleich inc/datahandlers/user.php - 1.8.7 - 1.8.25

Keine Änderungen Hinzugefügt Modifiziert Entfernt
Zeile 187	Zeile 187
} // Has the user tried to use their email address or username as a password?	} // Has the user tried to use their email address or username as a password?
if($user['email'] === $user['password'] \|\| $user['username'] === $user['password'])	if(!empty($user['email']) && !empty($user['username']))
{	{
$this->set_error('bad_password_security'); return false; }	if($user['email'] === $user['password'] \|\| $user['username'] === $user['password'] \|\| strpos($user['password'], $user['email']) !== false \|\| strpos($user['password'], $user['username']) !== false \|\| strpos($user['email'], $user['password']) !== false \|\| strpos($user['username'], $user['password']) !== false) { $this->set_error('bad_password_security'); return false; } }
// See if the board has "require complex passwords" enabled. if($mybb->settings['requirecomplexpasswords'] == 1) {	// See if the board has "require complex passwords" enabled. if($mybb->settings['requirecomplexpasswords'] == 1) {
Zeile 203	Zeile 208
$this->set_error('no_complex_characters', array($mybb->settings['minpasswordlength'])); return false; }	$this->set_error('no_complex_characters', array($mybb->settings['minpasswordlength'])); return false; }
}	}
// If we have a "password2" check if they both match if(isset($user['password2']) && $user['password'] !== $user['password2']) { $this->set_error("passwords_dont_match");	// If we have a "password2" check if they both match if(isset($user['password2']) && $user['password'] !== $user['password2']) { $this->set_error("passwords_dont_match");
return false; } // 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']);	return false; }
// Generate the user login key $user['loginkey'] = generate_loginkey();	// Generate the user login key $user['loginkey'] = generate_loginkey();
return true;	// Combine the password and salt $password_fields = create_password($user['password'], false, $user); $user = array_merge($user, $password_fields); return true;
}	}
/**	/**
* Verifies usergroup selections and other group details. * * @return boolean True when valid, false when invalid.	* Verifies usergroup selections and other group details. * * @return boolean True when valid, false when invalid.
Zeile 238	Zeile 238
} /** * Verifies if an email address is valid or not.	} /** * Verifies if an email address is valid or not.
* * @return boolean True when valid, false when invalid. */ function verify_email()	* * @return boolean True when valid, false when invalid. */ function verify_email()
{ global $mybb;	{ global $mybb;

$user = &$this->data; // Check if an email address has actually been entered. if(trim_blank_chrs($user['email']) == '') { $this->set_error('missing_email');	$user = &$this->data; // Check if an email address has actually been entered. if(trim_blank_chrs($user['email']) == '') { $this->set_error('missing_email');
return false; }	return false; }
// 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']))
{	{
$this->set_error('invalid_email_format'); return false; }	$this->set_error('invalid_email_format'); return false; }
Zeile 265	Zeile 265
if(is_banned_email($user['email'], true)) { $this->set_error('banned_email');	if(is_banned_email($user['email'], true)) { $this->set_error('banned_email');
return false; }	return false; }
// Check signed up emails // Ignore the ACP because the Merge System sometimes produces users with duplicate email addresses (Not A Bug) if($mybb->settings['allowmultipleemails'] == 0 && !defined("IN_ADMINCP"))	// Check signed up emails // Ignore the ACP because the Merge System sometimes produces users with duplicate email addresses (Not A Bug) if($mybb->settings['allowmultipleemails'] == 0 && !defined("IN_ADMINCP"))
Zeile 276	Zeile 276
if(isset($user['uid'])) { $uid = $user['uid'];	if(isset($user['uid'])) { $uid = $user['uid'];
}	}
if(email_already_in_use($user['email'], $uid)) { $this->set_error('email_already_in_use');	if(email_already_in_use($user['email'], $uid)) { $this->set_error('email_already_in_use');
Zeile 288	Zeile 288
if(isset($user['email2']) && $user['email'] != $user['email2']) { $this->set_error("emails_dont_match");	if(isset($user['email2']) && $user['email'] != $user['email2']) { $this->set_error("emails_dont_match");
return false; } return true; }	return false; } return true; }
/** * Verifies if a website is valid or not. *	/** * Verifies if a website is valid or not. *
Zeile 303	Zeile 303
{ $website = &$this->data['website'];	{ $website = &$this->data['website'];
if(empty($website) \|\| my_strtolower($website) == 'http://' \|\| my_strtolower($website) == 'https://') { $website = ''; return true; } // Does the website start with http(s)://? if(my_strtolower(substr($website, 0, 4)) != "http") { // Website does not start with http://, let's see if the user forgot. $website = "http://".$website; } if(!filter_var($website, FILTER_VALIDATE_URL))	if(!empty($website) && !my_validate_url($website)) { $website = 'http://'.$website; } if(!empty($website) && !my_validate_url($website))