Vergleich inc/datahandlers/user.php - 1.6.6 - 1.6.11

  Keine Änderungen   Hinzugefügt   Modifiziert   Entfernt
Zeile 6Zeile 6
 * Website: http://mybb.com
* License: http://mybb.com/about/license
*

 * Website: http://mybb.com
* License: http://mybb.com/about/license
*

 * $Id: user.php 5625 2011-10-02 19:16:35Z ralgith $

 * $Id$

 */

// Disallow direct access to this file for security reasons

 */

// Disallow direct access to this file for security reasons

Zeile 90Zeile 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 || utf8_handle_4byte_string($username, false) == false)

		{
$this->set_error("bad_characters_username");
return false;

		{
$this->set_error("bad_characters_username");
return false;

Zeile 116Zeile 116
		global $mybb;

$usertitle = &$this->data['usertitle'];

		global $mybb;

$usertitle = &$this->data['usertitle'];

 
		$usertitle = utf8_handle_4byte_string($usertitle);


// Check if the usertitle is of the correct length.
if($mybb->settings['customtitlemaxlength'] != 0 && my_strlen($usertitle) > $mybb->settings['customtitlemaxlength'])


// Check if the usertitle is of the correct length.
if($mybb->settings['customtitlemaxlength'] != 0 && my_strlen($usertitle) > $mybb->settings['customtitlemaxlength'])

Zeile 126Zeile 127

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 136Zeile 137
	{
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 160Zeile 161

/**
* 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 183Zeile 184
			// 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 196Zeile 197
		}

// 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 212Zeile 213

/**
* 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.
*/

	function verify_usergroup()
{
$user = &$this->data;

	function verify_usergroup()
{
$user = &$this->data;

Zeile 249Zeile 250
		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 261Zeile 262
				$this->set_error('email_already_in_use');
return false;
}

				$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.
*
* @return boolean True when valid, false when invalid.

	* Verifies if a website is valid or not.
*
* @return boolean True when valid, false when invalid.

Zeile 282Zeile 283
	{
$website = &$this->data['website'];


	{
$website = &$this->data['website'];


		if(empty($website) || my_strtolower($website) == 'http://' || my_strtolower($website) == 'https://')

		if(empty($website) || my_strtolower($website) == 'http://' || my_strtolower($website) == 'https://' || utf8_handle_4byte_string($website, false) == false)

		{
$website = '';
return true;

		{
$website = '';
return true;

Zeile 419Zeile 420
		}
return true;
}

		}
return true;
}

	























/**
* Verifies if the birthday privacy option is valid or not.
*
* @return boolean True when valid, false when invalid.
*/
function verify_birthday_privacy()
{
$birthdayprivacy = &$this->data['birthdayprivacy'];
$accepted = array(
'none',
'age',
'all');

if(!in_array($birthdayprivacy, $accepted))
{
$this->set_error("invalid_birthday_privacy");
return false;
}
return true;
}


	/**
* Verifies if the post count field is filled in correctly.
*

	/**
* Verifies if the post count field is filled in correctly.
*

Zeile 428Zeile 450
	function verify_postnum()
{
$user = &$this->data;

	function verify_postnum()
{
$user = &$this->data;

		



		if($user['postnum'] < 0)
{
$this->set_error("invalid_postnum");
return false;
}

		if($user['postnum'] < 0)
{
$this->set_error("invalid_postnum");
return false;
}

		



		return true;
}


		return true;
}


Zeile 454Zeile 476
		$userfields = array();
$comma = '';
$editable = '';

		$userfields = array();
$comma = '';
$editable = '';

		



		if(!$this->data['profile_fields_editable'])
{
$editable = "editable=1";

		if(!$this->data['profile_fields_editable'])
{
$editable = "editable=1";

Zeile 490Zeile 512
			// Sort out multiselect/checkbox profile fields.
$options = '';
if(($type == "multiselect" || $type == "checkbox") && is_array($profile_fields[$field]))

			// Sort out multiselect/checkbox profile fields.
$options = '';
if(($type == "multiselect" || $type == "checkbox") && is_array($profile_fields[$field]))

			{
$expoptions = explode("\n", $thing[1]);

			{
$expoptions = explode("\n", $thing[1]);

				$expoptions = array_map('trim', $expoptions);
foreach($profile_fields[$field] as $value)
{

				$expoptions = array_map('trim', $expoptions);
foreach($profile_fields[$field] as $value)
{

Zeile 523Zeile 545
					$this->set_error('max_limit_reached', array($profilefield['name'], $profilefield['maxlength']));
}


					$this->set_error('max_limit_reached', array($profilefield['name'], $profilefield['maxlength']));
}


				$options = $db->escape_string($profile_fields[$field]);



				$profile_fields[$field] = utf8_handle_4byte_string($profile_fields[$field]);

$options = $db->escape_string($profile_fields[$field]);

			}
else
{

			}
else
{

				$options = $db->escape_string($profile_fields[$field]);







				$profile_fields[$field] = utf8_handle_4byte_string($profile_fields[$field]);
if($profilefield['maxlength'] > 0 && my_strlen($profile_fields[$field]) > $profilefield['maxlength'])
{
$this->set_error('max_limit_reached', array($profilefield['name'], $profilefield['maxlength']));
}

$options = $db->escape_string($profile_fields[$field]);

			}
$user['user_fields'][$field] = $options;
}

			}
$user['user_fields'][$field] = $options;
}





		return true;
}


		return true;
}


Zeile 543Zeile 573
	function verify_referrer()
{
global $db, $mybb;

	function verify_referrer()
{
global $db, $mybb;





		$user = &$this->data;

// Does the referrer exist or not?

		$user = &$this->data;

// Does the referrer exist or not?

Zeile 559Zeile 589
		}
$user['referrer_uid'] = $referrer['uid'];


		}
$user['referrer_uid'] = $referrer['uid'];


		return true;
}


		return true;
}


	/**
* Verifies user options.
*

	/**
* Verifies user options.
*

Zeile 570Zeile 600
	function verify_options()
{
global $mybb;

	function verify_options()
{
global $mybb;

		



		$options = &$this->data['options'];

// Verify yes/no options.

		$options = &$this->data['options'];

// Verify yes/no options.

Zeile 586Zeile 616
		$this->verify_yesno_option($options, 'showavatars', 1);
$this->verify_yesno_option($options, 'showquickreply', 1);
$this->verify_yesno_option($options, 'showredirect', 1);

		$this->verify_yesno_option($options, 'showavatars', 1);
$this->verify_yesno_option($options, 'showquickreply', 1);
$this->verify_yesno_option($options, 'showredirect', 1);

		



		if($mybb->settings['postlayout'] == 'classic')

		if($mybb->settings['postlayout'] == 'classic')

		{

		{

			$this->verify_yesno_option($options, 'classicpostbit', 1);

			$this->verify_yesno_option($options, 'classicpostbit', 1);

		}

		}

		else
{
$this->verify_yesno_option($options, 'classicpostbit', 0);
}

		else
{
$this->verify_yesno_option($options, 'classicpostbit', 0);
}

		



		if(array_key_exists('subscriptionmethod', $options))
{
// Value out of range

		if(array_key_exists('subscriptionmethod', $options))
{
// Value out of range

Zeile 615Zeile 645
				$options['dstcorrection'] = 0;
}
}

				$options['dstcorrection'] = 0;
}
}

		



		if($options['dstcorrection'] == 1)
{
$options['dst'] = 1;

		if($options['dstcorrection'] == 1)
{
$options['dst'] = 1;

Zeile 637Zeile 667
        {
$options['showcodebuttons'] = 1;
}

        {
$options['showcodebuttons'] = 1;
}

		



		if($this->method == "insert" || (isset($options['threadmode']) && $options['threadmode'] != "linear" && $options['threadmode'] != "threaded"))
{
if($mybb->settings['threadusenetstyle'])

		if($this->method == "insert" || (isset($options['threadmode']) && $options['threadmode'] != "linear" && $options['threadmode'] != "threaded"))
{
if($mybb->settings['threadusenetstyle'])

Zeile 671Zeile 701
		{
$explodedppp = explode(",", $mybb->settings['userpppoptions']);
if(is_array($explodedppp))

		{
$explodedppp = explode(",", $mybb->settings['userpppoptions']);
if(is_array($explodedppp))

			{

			{

				@asort($explodedppp);
$biggest = $explodedppp[count($explodedppp)-1];
// Is the selected option greater than the allowed options?

				@asort($explodedppp);
$biggest = $explodedppp[count($explodedppp)-1];
// Is the selected option greater than the allowed options?

Zeile 706Zeile 736
		$regdate = intval($regdate);
// If the timestamp is below 0, set it to the current time.
if($regdate <= 0)

		$regdate = intval($regdate);
// If the timestamp is below 0, set it to the current time.
if($regdate <= 0)

		{

		{

			$regdate = TIME_NOW;
}
return true;
}

			$regdate = TIME_NOW;
}
return true;
}





	/**
* Verifies if a last visit date is valid or not.
*

	/**
* Verifies if a last visit date is valid or not.
*

Zeile 724Zeile 754
		$lastvisit = intval($lastvisit);
// If the timestamp is below 0, set it to the current time.
if($lastvisit <= 0)

		$lastvisit = intval($lastvisit);
// If the timestamp is below 0, set it to the current time.
if($lastvisit <= 0)

		{

		{

			$lastvisit = TIME_NOW;
}
return true;

			$lastvisit = TIME_NOW;
}
return true;

Zeile 758Zeile 788
	function verify_away()
{
global $mybb;

	function verify_away()
{
global $mybb;


$user = &$this->data;


$user = &$this->data;

		// If the board does not allow "away mode" or the user is marking as not away, set defaults.
if($mybb->settings['allowaway'] == 0 || $user['away']['away'] != 1)

		// If the board does not allow "away mode" or the user is marking as not away, set defaults.
if($mybb->settings['allowaway'] == 0 || $user['away']['away'] != 1)

		{

		{

			$user['away']['away'] = 0;
$user['away']['date'] = 0;
$user['away']['returndate'] = 0;

			$user['away']['away'] = 0;
$user['away']['date'] = 0;
$user['away']['returndate'] = 0;

Zeile 777Zeile 807
				$this->set_error("missing_returndate");
return false;
}

				$this->set_error("missing_returndate");
return false;
}

			



			// Validate the return date lengths
$user['away']['returndate'] = substr($returnday, 0, 2).'-'.substr($returnmonth, 0, 2).'-'.substr($returnyear, 0, 4);
}

			// Validate the return date lengths
$user['away']['returndate'] = substr($returnday, 0, 2).'-'.substr($returnmonth, 0, 2).'-'.substr($returnyear, 0, 4);
}

Zeile 803Zeile 833
		}
return true;
}

		}
return true;
}

	



	/**
* Verifies if this is coming from a spam bot or not
*

	/**
* Verifies if this is coming from a spam bot or not
*

Zeile 812Zeile 842
	function verify_checkfields()
{
$user = &$this->data;

	function verify_checkfields()
{
$user = &$this->data;

		



		// An invalid language has been specified?
if($user['regcheck1'] !== "" || $user['regcheck2'] !== "true")

		// An invalid language has been specified?
if($user['regcheck1'] !== "" || $user['regcheck2'] !== "true")

		{

		{

			$this->set_error("invalid_checkfield");
return false;
}

			$this->set_error("invalid_checkfield");
return false;
}

Zeile 850Zeile 880
			else
{
unset($user['username']);

			else
{
unset($user['username']);

			}

			}

		}
if($this->method == "insert" || array_key_exists('usertitle', $user))
{

		}
if($this->method == "insert" || array_key_exists('usertitle', $user))
{

Zeile 869Zeile 899
			$this->verify_email();
}
if($this->method == "insert" || array_key_exists('website', $user))

			$this->verify_email();
}
if($this->method == "insert" || array_key_exists('website', $user))

		{

		{

			$this->verify_website();
}
if($this->method == "insert" || array_key_exists('icq', $user))

			$this->verify_website();
}
if($this->method == "insert" || array_key_exists('icq', $user))

Zeile 887Zeile 917
		if($this->method == "insert" || array_key_exists('postnum', $user))
{
$this->verify_postnum();

		if($this->method == "insert" || array_key_exists('postnum', $user))
{
$this->verify_postnum();

		}

		}

		if($this->method == "insert" || array_key_exists('profile_fields', $user))
{
$this->verify_profile_fields();

		if($this->method == "insert" || array_key_exists('profile_fields', $user))
{
$this->verify_profile_fields();

Zeile 905Zeile 935
			$this->verify_regdate();
}
if($this->method == "insert" || array_key_exists('lastvisit', $user))

			$this->verify_regdate();
}
if($this->method == "insert" || array_key_exists('lastvisit', $user))

		{

		{

			$this->verify_lastvisit();
}
if($this->method == "insert" || array_key_exists('lastactive', $user))

			$this->verify_lastvisit();
}
if($this->method == "insert" || array_key_exists('lastactive', $user))

Zeile 924Zeile 954
		{
$this->verify_checkfields();
}

		{
$this->verify_checkfields();
}

		
$plugins->run_hooks_by_ref("datahandler_user_validate", $this);






		if(array_key_exists('birthdayprivacy', $user))
{
$this->verify_birthday_privacy();
}

$plugins->run_hooks("datahandler_user_validate", $this);


		// We are done validating, return.
$this->set_validated(true);
if(count($this->get_errors()) > 0)

		// We are done validating, return.
$this->set_validated(true);
if(count($this->get_errors()) > 0)

Zeile 974Zeile 1008
			"regdate" => intval($user['regdate']),
"lastactive" => intval($user['lastactive']),
"lastvisit" => intval($user['lastvisit']),

			"regdate" => intval($user['regdate']),
"lastactive" => intval($user['lastactive']),
"lastvisit" => intval($user['lastvisit']),

			"website" => $db->escape_string(htmlspecialchars($user['website'])),

			"website" => $db->escape_string(htmlspecialchars_uni($user['website'])),

			"icq" => intval($user['icq']),

			"icq" => intval($user['icq']),

			"aim" => $db->escape_string(htmlspecialchars($user['aim'])),
"yahoo" => $db->escape_string(htmlspecialchars($user['yahoo'])),
"msn" => $db->escape_string(htmlspecialchars($user['msn'])),

			"aim" => $db->escape_string(htmlspecialchars_uni($user['aim'])),
"yahoo" => $db->escape_string(htmlspecialchars_uni($user['yahoo'])),
"msn" => $db->escape_string(htmlspecialchars_uni($user['msn'])),

			"birthday" => $user['bday'],
"signature" => $db->escape_string($user['signature']),
"allownotices" => $user['options']['allownotices'],

			"birthday" => $user['bday'],
"signature" => $db->escape_string($user['signature']),
"allownotices" => $user['options']['allownotices'],

Zeile 1026Zeile 1060
			"classicpostbit" => $user['options']['classicpostbit'],
"usernotes" => ''
);

			"classicpostbit" => $user['options']['classicpostbit'],
"usernotes" => ''
);

		



		if($user['options']['dstcorrection'] == 1)
{
$this->user_insert_data['dst'] = 1;
}
else if($user['options']['dstcorrection'] == 0)

		if($user['options']['dstcorrection'] == 1)
{
$this->user_insert_data['dst'] = 1;
}
else if($user['options']['dstcorrection'] == 0)

		{

		{

			$this->user_insert_data['dst'] = 0;

			$this->user_insert_data['dst'] = 0;

		}

$plugins->run_hooks_by_ref("datahandler_user_insert", $this);


		}

$plugins->run_hooks("datahandler_user_insert", $this);


		$this->uid = $db->insert_query("users", $this->user_insert_data);

		$this->uid = $db->insert_query("users", $this->user_insert_data);

		



		$user['user_fields']['ufid'] = $this->uid;

		$user['user_fields']['ufid'] = $this->uid;

		



		$query = $db->simple_select("profilefields", "fid");
while($profile_field = $db->fetch_array($query))
{

		$query = $db->simple_select("profilefields", "fid");
while($profile_field = $db->fetch_array($query))
{

Zeile 1053Zeile 1087
		}

$db->insert_query("userfields", $user['user_fields'], false);

		}

$db->insert_query("userfields", $user['user_fields'], false);

		



		if($this->user_insert_data['referrer'] != 0)
{
$db->write_query("

		if($this->user_insert_data['referrer'] != 0)
{
$db->write_query("

Zeile 1155Zeile 1189
		}
if(isset($user['website']))
{

		}
if(isset($user['website']))
{

			$this->user_update_data['website'] = $db->escape_string(htmlspecialchars($user['website']));

			$this->user_update_data['website'] = $db->escape_string(htmlspecialchars_uni($user['website']));

		}
if(isset($user['icq']))
{

		}
if(isset($user['icq']))
{

Zeile 1163Zeile 1197
		}
if(isset($user['aim']))
{

		}
if(isset($user['aim']))
{

			$this->user_update_data['aim'] = $db->escape_string(htmlspecialchars($user['aim']));

			$this->user_update_data['aim'] = $db->escape_string(htmlspecialchars_uni($user['aim']));

		}
if(isset($user['yahoo']))
{

		}
if(isset($user['yahoo']))
{

			$this->user_update_data['yahoo'] = $db->escape_string(htmlspecialchars($user['yahoo']));

			$this->user_update_data['yahoo'] = $db->escape_string(htmlspecialchars_uni($user['yahoo']));

		}
if(isset($user['msn']))
{

		}
if(isset($user['msn']))
{

			$this->user_update_data['msn'] = $db->escape_string(htmlspecialchars($user['msn']));

			$this->user_update_data['msn'] = $db->escape_string(htmlspecialchars_uni($user['msn']));

		}
if(isset($user['bday']))
{

		}
if(isset($user['bday']))
{

Zeile 1239Zeile 1273
		{
unset($this->user_update_data['pmnotice']);
}

		{
unset($this->user_update_data['pmnotice']);
}

		
$plugins->run_hooks_by_ref("datahandler_user_update", $this);



$plugins->run_hooks("datahandler_user_update", $this);


		if(count($this->user_update_data) < 1 && empty($user['user_fields']))

		if(count($this->user_update_data) < 1 && empty($user['user_fields']))

		{ 
return false;
}

		{
return false;
}


if(count($this->user_update_data) > 0)
{
// Actual updating happens here.
$db->update_query("users", $this->user_update_data, "uid='{$user['uid']}'");


if(count($this->user_update_data) > 0)
{
// Actual updating happens here.
$db->update_query("users", $this->user_update_data, "uid='{$user['uid']}'");

		}


		}


		$cache->update_moderators();

		$cache->update_moderators();

		if(isset($user['bday']))

		if(isset($user['bday']) || isset($user['username']))

		{
$cache->update_birthdays();

		{
$cache->update_birthdays();

		}


		}


		// Maybe some userfields need to be updated?
if(is_array($user['user_fields']))
{

		// Maybe some userfields need to be updated?
if(is_array($user['user_fields']))
{

Zeile 1298Zeile 1332
			$db->update_query("threads", $username_update, "uid='{$user['uid']}'");
$db->update_query("threads", $lastposter_update, "lastposteruid='{$user['uid']}'");
$db->update_query("forums", $lastposter_update, "lastposteruid='{$user['uid']}'");

			$db->update_query("threads", $username_update, "uid='{$user['uid']}'");
$db->update_query("threads", $lastposter_update, "lastposteruid='{$user['uid']}'");
$db->update_query("forums", $lastposter_update, "lastposteruid='{$user['uid']}'");

			



			$stats = $cache->read("stats");
if($stats['lastuid'] == $user['uid'])
{

			$stats = $cache->read("stats");
if($stats['lastuid'] == $user['uid'])
{