Vergleich inc/datahandlers/user.php - 1.8.8 - 1.8.11

Keine Änderungen Hinzugefügt Modifiziert Entfernt
Zeile 211	Zeile 211
$this->set_error("passwords_dont_match"); return false; }	$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']);
// 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.	/** * Verifies usergroup selections and other group details.
*	*
* @return boolean True when valid, false when invalid. */ function verify_usergroup()	* @return boolean True when valid, false when invalid. */ function verify_usergroup()
Zeile 242	Zeile 237
* @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');	$this->set_error('invalid_email_format');
return false; }	return false; }
// Check banned emails if(is_banned_email($user['email'], true)) { $this->set_error('banned_email');	// Check banned emails 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 271
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'); return false; }	if(email_already_in_use($user['email'], $uid)) { $this->set_error('email_already_in_use'); return false; }
}	}
// If we have an "email2", verify it matches the existing email if(isset($user['email2']) && $user['email'] != $user['email2']) { $this->set_error("emails_dont_match");	// If we have an "email2", verify it matches the existing email 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 302	Zeile 297
function verify_website() { $website = &$this->data['website'];	function verify_website() { $website = &$this->data['website'];

if(!empty($website) && !my_validate_url($website)) { $website = 'http://'.$website;	if(!empty($website) && !my_validate_url($website)) { $website = 'http://'.$website;
Zeile 311	Zeile 306
if(!empty($website) && !my_validate_url($website)) { $this->set_error('invalid_website');	if(!empty($website) && !my_validate_url($website)) { $this->set_error('invalid_website');
return false; } return true; }	return false; } return true; }
/** * Verifies if an ICQ number is valid or not.	/** * Verifies if an ICQ number is valid or not.
Zeile 361	Zeile 356
if($birthday['day'] != 0 \|\| $birthday['month'] != 0) { if($birthday['day'] < 1 \|\| $birthday['day'] > 31 \|\| $birthday['month'] < 1 \|\| $birthday['month'] > 12 \|\| ($birthday['month'] == 2 && $birthday['day'] > 29))	if($birthday['day'] != 0 \|\| $birthday['month'] != 0) { if($birthday['day'] < 1 \|\| $birthday['day'] > 31 \|\| $birthday['month'] < 1 \|\| $birthday['month'] > 12 \|\| ($birthday['month'] == 2 && $birthday['day'] > 29))
{ $this->set_error("invalid_birthday"); return false; }	{ $this->set_error("invalid_birthday"); return false; }
} // Check if the day actually exists.	} // Check if the day actually exists.
Zeile 413	Zeile 408