| 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.
| }
// See if the board has "require complex passwords" enabled.
|
| Zeile 211 | Zeile 216 |
|---|
$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();
|
| | // 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.
*/
function verify_usergroup()
{
|
return true;
}
|
return true;
}
|
| |
/**
|
/**
|
* Verifies usergroup selections and other group details.
| * Verifies if an email address is valid or not.
|
*
* @return boolean True when valid, false when invalid.
*/
|
*
* @return boolean True when valid, false when invalid.
*/
|
function verify_usergroup()
| function verify_email()
|
{
|
{
|
return true;
}
/**
* Verifies if an email address is valid or not.
*
* @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.
| $user = &$this->data;
// Check if an email address has actually been entered.
|
| 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.
*
* @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 381 | Zeile 381 |
|---|
$this->set_error("invalid_birthday");
return false;
}
|
$this->set_error("invalid_birthday");
return false;
}
|
else if($birthday['year'] == date("Y"))
| elseif($birthday['year'] == date("Y"))
|
{
// Error if birth date is in future
if($birthday['month'] > date("m") || ($birthday['month'] == date("m") && $birthday['day'] > date("d")))
| {
// Error if birth date is in future
if($birthday['month'] > date("m") || ($birthday['month'] == date("m") && $birthday['day'] > date("d")))
|
| Zeile 395 | Zeile 395 |
|---|
if($mybb->settings['coppa'] == "enabled" && ($birthday['year'] == 0 || !$birthday['year']))
{
$this->set_error("invalid_birthday_coppa");
|
if($mybb->settings['coppa'] == "enabled" && ($birthday['year'] == 0 || !$birthday['year']))
{
$this->set_error("invalid_birthday_coppa");
|
return false;
}
| return false;
}
|
elseif(($mybb->settings['coppa'] == "deny" && $birthday['year'] > (date("Y")-13)) && !is_moderator())
|
elseif(($mybb->settings['coppa'] == "deny" && $birthday['year'] > (date("Y")-13)) && !is_moderator())
|
{
| {
|
$this->set_error("invalid_birthday_coppa2");
return false;
}
| $this->set_error("invalid_birthday_coppa2");
return false;
}
|
| Zeile 410 | Zeile 410 |
|---|
$user['bday'] = $birthday['day']."-".$birthday['month']."-".$birthday['year'];
}
elseif($birthday['day'] && $birthday['month'])
|
$user['bday'] = $birthday['day']."-".$birthday['month']."-".$birthday['year'];
}
elseif($birthday['day'] && $birthday['month'])
|
{
| {
|
// If only a day and month are specified, put together a d-m string
$user['bday'] = $birthday['day']."-".$birthday['month']."-";
}
| // If only a day and month are specified, put together a d-m string
$user['bday'] = $birthday['day']."-".$birthday['month']."-";
}
|
| Zeile 439 | Zeile 439 |
|---|
{
$this->set_error("invalid_birthday_privacy");
return false;
|
{
$this->set_error("invalid_birthday_privacy");
return false;
|
| | }
else if ($birthdayprivacy == 'age')
{
$birthdayyear = &$this->data['birthday']['year'];
if(empty($birthdayyear))
{
$this->set_error("conflicted_birthday_privacy");
return false;
}
|
}
return true;
}
| }
return true;
}
|
| Zeile 449 | Zeile 458 |
|---|
* @return boolean True when valid, false when invalid.
*/
function verify_postnum()
|
* @return boolean True when valid, false when invalid.
*/
function verify_postnum()
|
{
$user = &$this->data;
| {
$user = &$this->data;
|
if(isset($user['postnum']) && $user['postnum'] < 0)
{
$this->set_error("invalid_postnum");
return false;
}
|
if(isset($user['postnum']) && $user['postnum'] < 0)
{
$this->set_error("invalid_postnum");
return false;
}
|
|
|
return true;
}
/**
* Verifies if the thread count field is filled in correctly.
|
return true;
}
/**
* Verifies if the thread count field is filled in correctly.
|
*
| *
|
* @return boolean True when valid, false when invalid.
*/
function verify_threadnum()
{
$user = &$this->data;
|
* @return boolean True when valid, false when invalid.
*/
function verify_threadnum()
{
$user = &$this->data;
|
|
|
if(isset($user['threadnum']) && $user['threadnum'] < 0)
{
$this->set_error("invalid_threadnum");
| if(isset($user['threadnum']) && $user['threadnum'] < 0)
{
$this->set_error("invalid_threadnum");
|
| Zeile 477 | Zeile 486 |
|---|
}
return true;
|
}
return true;
|
}
| }
|
/**
* Verifies if a profile fields are filled in correctly.
|
/**
* Verifies if a profile fields are filled in correctly.
|
| Zeile 491 | Zeile 500 |
|---|
$user = &$this->data;
$profile_fields = &$this->data['profile_fields'];
|
$user = &$this->data;
$profile_fields = &$this->data['profile_fields'];
|
// Loop through profile fields checking if they exist or not and are filled in.
| // Loop through profile fields checking if they exist or not and are filled in.
|
// Fetch all profile fields first.
$pfcache = $cache->read('profilefields');
|
// Fetch all profile fields first.
$pfcache = $cache->read('profilefields');
|
|
|
if(is_array($pfcache))
{
// Then loop through the profile fields.
foreach($pfcache as $profilefield)
{
if(isset($this->data['profile_fields_editable']) || isset($this->data['registration']) && ($profilefield['required'] == 1 || $profilefield['registration'] == 1))
|
if(is_array($pfcache))
{
// Then loop through the profile fields.
foreach($pfcache as $profilefield)
{
if(isset($this->data['profile_fields_editable']) || isset($this->data['registration']) && ($profilefield['required'] == 1 || $profilefield['registration'] == 1))
|
{
| {
|
$profilefield['editableby'] = -1;
}
|
$profilefield['editableby'] = -1;
}
|
if(!is_member($profilefield['editableby'], array('usergroup' => $user['usergroup'], 'additionalgroups' => $user['additionalgroups'])))
| if(isset($user['usergroup']))
{
$usergroup = $user['usergroup'];
}
else
{
$usergroup = '';
}
if(isset($user['additionalgroups']))
{
$additionalgroups = $user['additionalgroups'];
}
else
{
$additionalgroups = '';
}
if(!is_member($profilefield['editableby'], array('usergroup' => $usergroup, 'additionalgroups' => $additionalgroups)))
|
{
continue;
}
| {
continue;
}
|
| Zeile 577 | Zeile 603 |
|---|
$this->set_error('max_limit_reached', array($profilefield['name'], $profilefield['maxlength']));
}
|
$this->set_error('max_limit_reached', array($profilefield['name'], $profilefield['maxlength']));
}
|
if(!empty($profilefield['regex']) && !preg_match("#".$profilefield['regex']."#i", $profile_fields[$field]))
| if(!empty($profilefield['regex']) && !empty($profile_fields[$field]) && !preg_match("#".$profilefield['regex']."#i", $profile_fields[$field]))
|
{
$this->set_error('bad_profile_field_value', array($profilefield['name']));
}
| {
$this->set_error('bad_profile_field_value', array($profilefield['name']));
}
|
| Zeile 603 | Zeile 629 |
|---|
$user = &$this->data;
// Does the referrer exist or not?
|
$user = &$this->data;
// Does the referrer exist or not?
|
if($mybb->settings['usereferrals'] == 1 && $user['referrer'] != '')
| if($mybb->settings['usereferrals'] == 1 && !empty($user['referrer']))
|
{
$referrer = get_user_by_username($user['referrer']);
| {
$referrer = get_user_by_username($user['referrer']);
|
| Zeile 633 | Zeile 659 |
|---|
global $mybb;
$options = &$this->data['options'];
|
global $mybb;
$options = &$this->data['options'];
|
| |
if(!is_array($options))
{
$options = array();
}
|
// Verify yes/no options.
$this->verify_yesno_option($options, 'allownotices', 1);
|
// Verify yes/no options.
$this->verify_yesno_option($options, 'allownotices', 1);
|
| Zeile 652 | Zeile 683 |
|---|
$this->verify_yesno_option($options, 'sourceeditor', 0);
$this->verify_yesno_option($options, 'buddyrequestspm', 1);
$this->verify_yesno_option($options, 'buddyrequestsauto', 0);
|
$this->verify_yesno_option($options, 'sourceeditor', 0);
$this->verify_yesno_option($options, 'buddyrequestspm', 1);
$this->verify_yesno_option($options, 'buddyrequestsauto', 0);
|
|
|
if($mybb->settings['postlayout'] == 'classic')
{
$this->verify_yesno_option($options, 'classicpostbit', 1);
| if($mybb->settings['postlayout'] == 'classic')
{
$this->verify_yesno_option($options, 'classicpostbit', 1);
|
| Zeile 673 | Zeile 704 |
|---|
}
if(array_key_exists('dstcorrection', $options))
|
}
if(array_key_exists('dstcorrection', $options))
|
{
| {
|
// Value out of range
$options['dstcorrection'] = (int)$options['dstcorrection'];
if($options['dstcorrection'] < 0 || $options['dstcorrection'] > 2)
{
$options['dstcorrection'] = 0;
|
// Value out of range
$options['dstcorrection'] = (int)$options['dstcorrection'];
if($options['dstcorrection'] < 0 || $options['dstcorrection'] > 2)
{
$options['dstcorrection'] = 0;
|
}
}
if($options['dstcorrection'] == 1)
{
$options['dst'] = 1;
}
else if($options['dstcorrection'] == 0)
{
$options['dst'] = 0;
| }
if($options['dstcorrection'] == 1)
{
$options['dst'] = 1;
}
elseif($options['dstcorrection'] == 0)
{
$options['dst'] = 0;
}
|
}
|
}
|
if($this->method == "insert" || (isset($options['threadmode']) && $options['threadmode'] != "linear" && $options['threadmode'] != "threaded"))
| if($this->method == "insert" || (isset($options['threadmode']) && $options['threadmode'] != "linear" && $options['threadmode'] != "threaded" && $options['threadmode'] != ''))
|
{
|
{
|
if($mybb->settings['threadusenetstyle'])
{
$options['threadmode'] = 'threaded';
}
else
{
$options['threadmode'] = 'linear';
}
| $options['threadmode'] = '';
|
}
// Verify the "threads per page" option.
| }
// Verify the "threads per page" option.
|
| Zeile 834 | Zeile 858 |
|---|
$user['away']['awayreason'] = '';
return true;
}
|
$user['away']['awayreason'] = '';
return true;
}
|
else if($user['away']['returndate'])
| elseif($user['away']['returndate'])
|
{
|
{
|
| | // Validate the awayreason length, since the db holds 200 chars for this field
$reasonlength = my_strlen($user['away']['awayreason']);
if($reasonlength > 200)
{
$this->set_error("away_too_long", array($reasonlength - 200));
return false;
}
|
list($returnday, $returnmonth, $returnyear) = explode('-', $user['away']['returndate']);
if(!$returnday || !$returnmonth || !$returnyear)
{
| list($returnday, $returnmonth, $returnyear) = explode('-', $user['away']['returndate']);
if(!$returnday || !$returnmonth || !$returnyear)
{
|
| Zeile 855 | Zeile 887 |
|---|
* @return boolean True when valid, false when invalid.
*/
function verify_language()
|
* @return boolean True when valid, false when invalid.
*/
function verify_language()
|
{
global $lang;
| {
global $lang;
|
$language = &$this->data['language'];
// An invalid language has been specified?
| $language = &$this->data['language'];
// An invalid language has been specified?
|
| Zeile 877 | Zeile 909 |
|---|
function verify_style()
{
global $lang;
|
function verify_style()
{
global $lang;
|
$user = &$this->data;
if($user['style'])
|
$user = &$this->data;
if(!empty($user['style']))
|
{
$theme = get_theme($user['style']);
|
{
$theme = get_theme($user['style']);
|
|
|
if(empty($theme) || !is_member($theme['allowedgroups'], $user) && $theme['allowedgroups'] != 'all')
{
$this->set_error('invalid_style');
| if(empty($theme) || !is_member($theme['allowedgroups'], $user) && $theme['allowedgroups'] != 'all')
{
$this->set_error('invalid_style');
|
| Zeile 900 | Zeile 932 |
|---|
* @return boolean True when valid, false when invalid.
*/
function verify_checkfields()
|
* @return boolean True when valid, false when invalid.
*/
function verify_checkfields()
|
{
$user = &$this->data;
| {
$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")
{
|
| Zeile 911 | Zeile 943 |
|---|
}
return true;
}
|
}
return true;
}
|
|
|
/**
* Verifies if the user timezone is valid.
* If the timezone is invalid, the board default is used.
| /**
* Verifies if the user timezone is valid.
* If the timezone is invalid, the board default is used.
|
| Zeile 919 | Zeile 951 |
|---|
* @return boolean True when timezone was valid, false otherwise
*/
function verify_timezone()
|
* @return boolean True when timezone was valid, false otherwise
*/
function verify_timezone()
|
{
$user = &$this->data;
$timezones = get_supported_timezones();
if(!array_key_exists($user['timezone'], $timezones))
| {
global $mybb;
$user = &$this->data;
$timezones = get_supported_timezones();
if(!isset($user['timezone']) || !array_key_exists($user['timezone'], $timezones))
|
{
$user['timezone'] = $mybb->settings['timezoneoffset'];
return false;
| {
$user['timezone'] = $mybb->settings['timezoneoffset'];
return false;
|
| Zeile 941 | Zeile 975 |
|---|
function validate_user()
{
global $mybb, $plugins;
|
function validate_user()
{
global $mybb, $plugins;
|
|
|
$user = &$this->data;
// First, grab the old user details if this user exists
if(!empty($user['uid']))
|
$user = &$this->data;
// First, grab the old user details if this user exists
if(!empty($user['uid']))
|
{
| {
|
$old_user = get_user($user['uid']);
}
| $old_user = get_user($user['uid']);
}
|
| Zeile 1010 | Zeile 1044 |
|---|
if($this->method == "insert" || array_key_exists('options', $user))
{
$this->verify_options();
|
if($this->method == "insert" || array_key_exists('options', $user))
{
$this->verify_options();
|
}
| }
|
if($this->method == "insert" || array_key_exists('regdate', $user))
{
$this->verify_regdate();
|
if($this->method == "insert" || array_key_exists('regdate', $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))
|
if($this->method == "insert" || array_key_exists('lastvisit', $user))
{
$this->verify_lastvisit();
}
if($this->method == "insert" || array_key_exists('lastactive', $user))
|
{
| {
|
$this->verify_lastactive();
}
if($this->method == "insert" || array_key_exists('away', $user))
| $this->verify_lastactive();
}
if($this->method == "insert" || array_key_exists('away', $user))
|
| Zeile 1030 | Zeile 1064 |
|---|
if($this->method == "insert" || array_key_exists('language', $user))
{
$this->verify_language();
|
if($this->method == "insert" || array_key_exists('language', $user))
{
$this->verify_language();
|
}
| }
|
if($this->method == "insert" || array_key_exists('timezone', $user))
{
$this->verify_timezone();
}
if($this->method == "insert" && array_key_exists('regcheck1', $user) && array_key_exists('regcheck2', $user))
|
if($this->method == "insert" || array_key_exists('timezone', $user))
{
$this->verify_timezone();
}
if($this->method == "insert" && array_key_exists('regcheck1', $user) && array_key_exists('regcheck2', $user))
|
{
| {
|
$this->verify_checkfields();
}
if(array_key_exists('birthdayprivacy', $user))
|
$this->verify_checkfields();
}
if(array_key_exists('birthdayprivacy', $user))
|
{
| {
|
$this->verify_birthday_privacy();
}
if($this->method == "insert" || array_key_exists('style', $user))
{
$this->verify_style();
|
$this->verify_birthday_privacy();
}
if($this->method == "insert" || array_key_exists('style', $user))
{
$this->verify_style();
|
}
| }
|
if($this->method == "insert" || array_key_exists('signature', $user))
{
$this->verify_signature();
| if($this->method == "insert" || array_key_exists('signature', $user))
{
$this->verify_signature();
|
| Zeile 1061 | Zeile 1095 |
|---|
return false;
}
else
|
return false;
}
else
|
{
| {
|
return true;
|
return true;
|
}
| }
|
}
/**
| }
/**
|
| Zeile 1074 | Zeile 1108 |
|---|
function insert_user()
{
global $db, $cache, $plugins;
|
function insert_user()
{
global $db, $cache, $plugins;
|
|
|
// Yes, validating is required.
if(!$this->get_validated())
|
// Yes, validating is required.
if(!$this->get_validated())
|
{
| {
|
die("The user needs to be validated before inserting it into the DB.");
}
if(count($this->get_errors()) > 0)
{
die("The user is not valid.");
|
die("The user needs to be validated before inserting it into the DB.");
}
if(count($this->get_errors()) > 0)
{
die("The user is not valid.");
|
}
$user = &$this->data;
$array = array('postnum', 'threadnum', 'avatar', 'avatartype', 'additionalgroups', 'displaygroup', 'icq', 'aim', 'yahoo', 'skype', 'google', 'bday', 'signature', 'style', 'dateformat', 'timeformat', 'notepad');
foreach($array as $value)
{
| }
$user = &$this->data;
$array = array('postnum', 'threadnum', 'avatar', 'avatartype', 'additionalgroups', 'displaygroup', 'icq', 'skype', 'google', 'bday', 'signature', 'style', 'dateformat', 'timeformat', 'notepad', 'regip', 'lastip', 'coppa_user');
foreach($array as $value)
{
|
if(!isset($user[$value]))
|
if(!isset($user[$value]))
|
{
| {
|
$user[$value] = '';
}
|
$user[$value] = '';
}
|
| | }
$array = array('subscriptionmethod', 'dstcorrection');
foreach($array as $value)
{
if(!isset($user['options'][$value]))
{
$user['options'][$value] = '';
}
}
// If user is being created from ACP, there is no last visit or last active
if(defined('IN_ADMINCP'))
{
$user['lastvisit'] = $user['lastactive'] = 0;
|
}
$this->user_insert_data = array(
"username" => $db->escape_string($user['username']),
|
}
$this->user_insert_data = array(
"username" => $db->escape_string($user['username']),
|
"password" => $user['saltedpw'],
| "password" => $user['password'],
|
"salt" => $user['salt'],
"loginkey" => $user['loginkey'],
"email" => $db->escape_string($user['email']),
| "salt" => $user['salt'],
"loginkey" => $user['loginkey'],
"email" => $db->escape_string($user['email']),
|
| Zeile 1115 | Zeile 1164 |
|---|
"lastvisit" => (int)$user['lastvisit'],
"website" => $db->escape_string($user['website']),
"icq" => (int)$user['icq'],
|
"lastvisit" => (int)$user['lastvisit'],
"website" => $db->escape_string($user['website']),
"icq" => (int)$user['icq'],
|
"aim" => $db->escape_string($user['aim']),
"yahoo" => $db->escape_string($user['yahoo']),
| |
"skype" => $db->escape_string($user['skype']),
"google" => $db->escape_string($user['google']),
"birthday" => $user['bday'],
| "skype" => $db->escape_string($user['skype']),
"google" => $db->escape_string($user['google']),
"birthday" => $user['bday'],
|
| Zeile 1145 | Zeile 1192 |
|---|
"dateformat" => $db->escape_string($user['dateformat']),
"timeformat" => $db->escape_string($user['timeformat']),
"regip" => $db->escape_binary($user['regip']),
|
"dateformat" => $db->escape_string($user['dateformat']),
"timeformat" => $db->escape_string($user['timeformat']),
"regip" => $db->escape_binary($user['regip']),
|
| | "lastip" => $db->escape_binary($user['lastip']),
|
"language" => $db->escape_string($user['language']),
"showcodebuttons" => (int)$user['options']['showcodebuttons'],
"sourceeditor" => (int)$user['options']['sourceeditor'],
| "language" => $db->escape_string($user['language']),
"showcodebuttons" => (int)$user['options']['showcodebuttons'],
"sourceeditor" => (int)$user['options']['sourceeditor'],
|
| Zeile 1154 | Zeile 1202 |
|---|
"awaydate" => (int)$user['away']['date'],
"returndate" => $user['away']['returndate'],
"awayreason" => $db->escape_string($user['away']['awayreason']),
|
"awaydate" => (int)$user['away']['date'],
"returndate" => $user['away']['returndate'],
"awayreason" => $db->escape_string($user['away']['awayreason']),
|
"notepad" => $db->escape_string($user['notepad']),
| |
"referrer" => (int)$user['referrer_uid'],
"referrals" => 0,
"buddylist" => '',
"ignorelist" => '',
|
"referrer" => (int)$user['referrer_uid'],
"referrals" => 0,
"buddylist" => '',
"ignorelist" => '',
|
"pmfolders" => '',
| "pmfolders" => "0**$%%$1**$%%$2**$%%$3**$%%$4**",
|
"notepad" => '',
"warningpoints" => 0,
"moderateposts" => 0,
| "notepad" => '',
"warningpoints" => 0,
"moderateposts" => 0,
|
| Zeile 1175 | Zeile 1222 |
|---|
{
$this->user_insert_data['dst'] = 1;
}
|
{
$this->user_insert_data['dst'] = 1;
}
|
else if($user['options']['dstcorrection'] == 0)
| elseif($user['options']['dstcorrection'] == 0)
|
{
$this->user_insert_data['dst'] = 0;
}
| {
$this->user_insert_data['dst'] = 0;
}
|
| Zeile 1215 | Zeile 1262 |
|---|
update_stats(array('numusers' => '+1'));
if((int)$user['usergroup'] == 5)
|
update_stats(array('numusers' => '+1'));
if((int)$user['usergroup'] == 5)
|
{
$cache->update_awaitingactivation();
}
| {
$cache->update_awaitingactivation();
}
|
$this->return_values = array(
"uid" => $this->uid,
"username" => $user['username'],
| $this->return_values = array(
"uid" => $this->uid,
"username" => $user['username'],
|
| Zeile 1261 | Zeile 1308 |
|---|
{
$this->user_update_data['username'] = $db->escape_string($user['username']);
}
|
{
$this->user_update_data['username'] = $db->escape_string($user['username']);
}
|
if(isset($user['saltedpw']))
| if(isset($user['password']))
{
$this->user_update_data['password'] = $user['password'];
}
if(isset($user['salt']))
|
{
|
{
|
$this->user_update_data['password'] = $user['saltedpw'];
| |
$this->user_update_data['salt'] = $user['salt'];
|
$this->user_update_data['salt'] = $user['salt'];
|
| | }
if(isset($user['loginkey']))
{
|
$this->user_update_data['loginkey'] = $user['loginkey'];
}
if(isset($user['email']))
{
|
$this->user_update_data['loginkey'] = $user['loginkey'];
}
if(isset($user['email']))
{
|
$this->user_update_data['email'] = $user['email'];
| $this->user_update_data['email'] = $db->escape_string($user['email']);
|
}
if(isset($user['postnum']))
{
| }
if(isset($user['postnum']))
{
|
| Zeile 1321 | Zeile 1374 |
|---|
$this->user_update_data['website'] = $db->escape_string($user['website']);
}
if(isset($user['icq']))
|
$this->user_update_data['website'] = $db->escape_string($user['website']);
}
if(isset($user['icq']))
|
{
| {
|
$this->user_update_data['icq'] = (int)$user['icq'];
|
$this->user_update_data['icq'] = (int)$user['icq'];
|
}
if(isset($user['aim']))
{
$this->user_update_data['aim'] = $db->escape_string($user['aim']);
}
if(isset($user['yahoo']))
{
$this->user_update_data['yahoo'] = $db->escape_string($user['yahoo']);
| |
}
if(isset($user['skype']))
{
| }
if(isset($user['skype']))
{
|
| Zeile 1367 | Zeile 1412 |
|---|
if(isset($user['regip']))
{
$this->user_update_data['regip'] = $db->escape_string($user['regip']);
|
if(isset($user['regip']))
{
$this->user_update_data['regip'] = $db->escape_string($user['regip']);
|
| | }
if(isset($user['lastip']))
{
$this->user_update_data['lastip'] = $db->escape_string($user['lastip']);
|
}
if(isset($user['language']))
{
| }
if(isset($user['language']))
{
|
| Zeile 1400 | Zeile 1449 |
|---|
}
// First, grab the old user details for later use.
$old_user = get_user($user['uid']);
|
}
// First, grab the old user details for later use.
$old_user = get_user($user['uid']);
|
|
|
// If old user has new pmnotice and new user has = yes, keep old value
if($old_user['pmnotice'] == "2" && $this->user_update_data['pmnotice'] == 1)
{
unset($this->user_update_data['pmnotice']);
|
// If old user has new pmnotice and new user has = yes, keep old value
if($old_user['pmnotice'] == "2" && $this->user_update_data['pmnotice'] == 1)
{
unset($this->user_update_data['pmnotice']);
|
}
$plugins->run_hooks("datahandler_user_update", $this);
| }
$plugins->run_hooks("datahandler_user_update", $this);
|
if(count($this->user_update_data) < 1 && empty($user['user_fields']))
{
return false;
| if(count($this->user_update_data) < 1 && empty($user['user_fields']))
{
return false;
|
| Zeile 1424 | Zeile 1473 |
|---|
if(isset($user['bday']) || isset($user['username']))
{
$cache->update_birthdays();
|
if(isset($user['bday']) || isset($user['username']))
{
$cache->update_birthdays();
|
}
| }
|
if(isset($user['usergroup']) && (int)$user['usergroup'] == 5)
{
$cache->update_awaitingactivation();
| if(isset($user['usergroup']) && (int)$user['usergroup'] == 5)
{
$cache->update_awaitingactivation();
|
| Zeile 1436 | Zeile 1485 |
|---|
{
$query = $db->simple_select("userfields", "*", "ufid='{$user['uid']}'");
$fields = $db->fetch_array($query);
|
{
$query = $db->simple_select("userfields", "*", "ufid='{$user['uid']}'");
$fields = $db->fetch_array($query);
|
if(!$fields['ufid'])
| if(empty($fields['ufid']))
|
{
$user_fields = array(
'ufid' => $user['uid']
| {
$user_fields = array(
'ufid' => $user['uid']
|
| Zeile 1581 | Zeile 1630 |
|---|
$plugins->run_hooks("datahandler_user_delete_end", $this);
// Update cache
|
$plugins->run_hooks("datahandler_user_delete_end", $this);
// Update cache
|
$cache->update_banned();
| |
$cache->update_moderators();
$cache->update_forumsdisplay();
$cache->update_reportedcontent();
$cache->update_awaitingactivation();
|
$cache->update_moderators();
$cache->update_forumsdisplay();
$cache->update_reportedcontent();
$cache->update_awaitingactivation();
|
| | $cache->update_birthdays();
|
return $this->return_values;
}
|
return $this->return_values;
}
|
| Zeile 1740 | Zeile 1789 |
|---|
"website" => "",
"birthday" => "",
"icq" => "",
|
"website" => "",
"birthday" => "",
"icq" => "",
|
"aim" => "",
"yahoo" => "",
| |
"skype" => "",
"google" => "",
"usertitle" => "",
| "skype" => "",
"google" => "",
"usertitle" => "",
|
| Zeile 1783 | Zeile 1830 |
|---|
public function verify_signature()
{
global $mybb, $parser;
|
public function verify_signature()
{
global $mybb, $parser;
|
| |
if(!isset($this->data['signature']))
{
return true;
}
|
if(!isset($parser))
{
require_once MYBB_ROOT."inc/class_parser.php";
$parser = new postParser;
|
if(!isset($parser))
{
require_once MYBB_ROOT."inc/class_parser.php";
$parser = new postParser;
|
}
| }
|
$parser_options = array(
'allow_html' => $mybb->settings['sightml'],
|
$parser_options = array(
'allow_html' => $mybb->settings['sightml'],
|
'filter_badwords' => 1,
| |
'allow_mycode' => $mybb->settings['sigmycode'],
'allow_smilies' => $mybb->settings['sigsmilies'],
'allow_imgcode' => $mybb->settings['sigimgcode'],
| 'allow_mycode' => $mybb->settings['sigmycode'],
'allow_smilies' => $mybb->settings['sigsmilies'],
'allow_imgcode' => $mybb->settings['sigimgcode'],
|
| Zeile 1808 | Zeile 1859 |
|---|
)
{
$imgsallowed = 0;
|
)
{
$imgsallowed = 0;
|
|
|
if($mybb->settings['sigimgcode'] == 1)
{
$imgsallowed = $mybb->settings['maxsigimages'];
| if($mybb->settings['sigimgcode'] == 1)
{
$imgsallowed = $mybb->settings['maxsigimages'];
|
| Zeile 1819 | Zeile 1870 |
|---|
if($mybb->settings['sigcountmycode'] == 0)
{
|
if($mybb->settings['sigcountmycode'] == 0)
{
|
$parsed_sig = $parser->text_parse_message($this->data['signature']);
| $parsed_sig = $parser->text_parse_message($this->data['signature'], array('signature_parse' => '1'));
|
}
else
{
$parsed_sig = $this->data['signature'];
}
|
}
else
{
$parsed_sig = $this->data['signature'];
}
|
$parsed_sig = preg_replace("#\s#", "", $parsed_sig);
$sig_length = my_strlen($parsed_sig);
if($sig_length > $mybb->settings['siglength'])
| if($mybb->settings['siglength'] > 0)
|
{
|
{
|
$this->set_error('sig_too_long', array($mybb->settings['siglength']));
| $parsed_sig = preg_replace("#\s#", "", $parsed_sig);
$sig_length = my_strlen($parsed_sig);
|
|
|
if($sig_length - $mybb->settings['siglength'] > 1)
| if($sig_length > $mybb->settings['siglength'])
|
{
|
{
|
$this->set_error('sig_remove_chars_plural', array($sig_length-$mybb->settings['siglength']));
}
else
{
$this->set_error('sig_remove_chars_singular');
| $this->set_error('sig_too_long', array($mybb->settings['siglength']));
if($sig_length - $mybb->settings['siglength'] > 1)
{
$this->set_error('sig_remove_chars_plural', array($sig_length-$mybb->settings['siglength']));
}
else
{
$this->set_error('sig_remove_chars_singular');
}
|
}
}
| }
}
|