| Zeile 314 | Zeile 314 |
|---|
return false;
}
|
return false;
}
|
return true;
}
/**
* Verifies if an ICQ number is valid or not.
*
* @return boolean True when valid, false when invalid.
*/
function verify_icq()
{
$icq = &$this->data['icq'];
if($icq != '' && !is_numeric($icq))
{
$this->set_error("invalid_icq_number");
return false;
}
$icq = (int)$icq;
| |
return true;
}
| return true;
}
|
| Zeile 379 | Zeile 361 |
|---|
if($birthday['year'] != 0 && ($birthday['year'] < (date("Y")-100)) || $birthday['year'] > date("Y"))
{
$this->set_error("invalid_birthday");
|
if($birthday['year'] != 0 && ($birthday['year'] < (date("Y")-100)) || $birthday['year'] > date("Y"))
{
$this->set_error("invalid_birthday");
|
return false;
| return false;
|
}
elseif($birthday['year'] == date("Y"))
{
| }
elseif($birthday['year'] == date("Y"))
{
|
| Zeile 389 | Zeile 371 |
|---|
$this->set_error("invalid_birthday");
return false;
}
|
$this->set_error("invalid_birthday");
return false;
}
|
}
| }
|
// Error if COPPA is on, and the user hasn't verified their age / under 13
if($mybb->settings['coppa'] == "enabled" && ($birthday['year'] == 0 || !$birthday['year']))
|
// Error if COPPA is on, and the user hasn't verified their age / under 13
if($mybb->settings['coppa'] == "enabled" && ($birthday['year'] == 0 || !$birthday['year']))
|
| Zeile 400 | Zeile 382 |
|---|
elseif(($mybb->settings['coppa'] == "deny" && $birthday['year'] > (date("Y")-13)) && !is_moderator())
{
$this->set_error("invalid_birthday_coppa2");
|
elseif(($mybb->settings['coppa'] == "deny" && $birthday['year'] > (date("Y")-13)) && !is_moderator())
{
$this->set_error("invalid_birthday_coppa2");
|
return false;
}
| return false;
}
|
// Make the user's birthday field
if($birthday['year'] != 0)
{
// If the year is specified, put together a d-m-y string
$user['bday'] = $birthday['day']."-".$birthday['month']."-".$birthday['year'];
|
// Make the user's birthday field
if($birthday['year'] != 0)
{
// If the year is specified, put together a d-m-y string
$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']."-";
|
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']."-";
|
}
| }
|
else
{
// No field is specified, so return an empty string for an unknown birthday
$user['bday'] = '';
|
else
{
// No field is specified, so return an empty string for an unknown birthday
$user['bday'] = '';
|
}
return true;
}
/**
| }
return true;
}
/**
|
* Verifies if the birthday privacy option is valid or not.
*
* @return boolean True when valid, false when invalid.
| * Verifies if the birthday privacy option is valid or not.
*
* @return boolean True when valid, false when invalid.
|
| Zeile 438 | Zeile 420 |
|---|
if(!in_array($birthdayprivacy, $accepted))
{
$this->set_error("invalid_birthday_privacy");
|
if(!in_array($birthdayprivacy, $accepted))
{
$this->set_error("invalid_birthday_privacy");
|
return false;
}
return true;
}
| return false;
}
else if ($birthdayprivacy == 'age')
{
$birthdayyear = &$this->data['birthday']['year'];
if(empty($birthdayyear))
{
$this->set_error("conflicted_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 455 | Zeile 446 |
|---|
if(isset($user['postnum']) && $user['postnum'] < 0)
{
$this->set_error("invalid_postnum");
|
if(isset($user['postnum']) && $user['postnum'] < 0)
{
$this->set_error("invalid_postnum");
|
return false;
}
return true;
}
| return false;
}
return true;
}
|
/**
* Verifies if the thread count field is filled in correctly.
*
| /**
* Verifies if the thread count field is filled in correctly.
*
|
| Zeile 504 | Zeile 495 |
|---|
if(isset($this->data['profile_fields_editable']) || isset($this->data['registration']) && ($profilefield['required'] == 1 || $profilefield['registration'] == 1))
{
$profilefield['editableby'] = -1;
|
if(isset($this->data['profile_fields_editable']) || isset($this->data['registration']) && ($profilefield['required'] == 1 || $profilefield['registration'] == 1))
{
$profilefield['editableby'] = -1;
|
}
if(!is_member($profilefield['editableby'], array('usergroup' => $user['usergroup'], 'additionalgroups' => $user['additionalgroups'])))
{
continue;
}
| }
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;
}
|
// Does this field have a minimum post count?
if(!isset($this->data['profile_fields_editable']) && !empty($profilefield['postnum']) && $profilefield['postnum'] > $user['postnum'])
{
| // Does this field have a minimum post count?
if(!isset($this->data['profile_fields_editable']) && !empty($profilefield['postnum']) && $profilefield['postnum'] > $user['postnum'])
{
|
| Zeile 600 | Zeile 608 |
|---|
{
global $db, $mybb;
|
{
global $db, $mybb;
|
$user = &$this->data;
| $user = &$this->data;
|
// Does the referrer exist or not?
|
// 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']);
|
if(empty($referrer['uid']))
| if(!$referrer)
|
{
$this->set_error('invalid_referrer', array($user['referrer']));
return false;
| {
$this->set_error('invalid_referrer', array($user['referrer']));
return false;
|
| Zeile 633 | Zeile 641 |
|---|
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 669 | Zeile 682 |
|---|
if($options['subscriptionmethod'] < 0 || $options['subscriptionmethod'] > 3)
{
$options['subscriptionmethod'] = 0;
|
if($options['subscriptionmethod'] < 0 || $options['subscriptionmethod'] > 3)
{
$options['subscriptionmethod'] = 0;
|
}
}
| }
}
|
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;
}
elseif($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 888 | Zeile 894 |
|---|
$user = &$this->data;
|
$user = &$this->data;
|
if($user['style'])
| if(!empty($user['style']))
|
{
$theme = get_theme($user['style']);
| {
$theme = get_theme($user['style']);
|
| Zeile 928 | Zeile 934 |
|---|
*/
function verify_timezone()
{
|
*/
function verify_timezone()
{
|
| | global $mybb;
|
$user = &$this->data;
|
$user = &$this->data;
|
|
|
$timezones = get_supported_timezones();
|
$timezones = get_supported_timezones();
|
if(!array_key_exists($user['timezone'], $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;
|
}
| }
|
return true;
}
|
return true;
}
|
| Zeile 976 | Zeile 984 |
|---|
$this->verify_usertitle();
}
if($this->method == "insert" || array_key_exists('password', $user))
|
$this->verify_usertitle();
}
if($this->method == "insert" || array_key_exists('password', $user))
|
{
| {
|
$this->verify_password();
|
$this->verify_password();
|
}
| }
|
if($this->method == "insert" || array_key_exists('usergroup', $user))
{
$this->verify_usergroup();
}
if($this->method == "insert" || array_key_exists('email', $user))
|
if($this->method == "insert" || array_key_exists('usergroup', $user))
{
$this->verify_usergroup();
}
if($this->method == "insert" || array_key_exists('email', $user))
|
{
| {
|
$this->verify_email();
|
$this->verify_email();
|
}
| }
|
if($this->method == "insert" || array_key_exists('website', $user))
|
if($this->method == "insert" || array_key_exists('website', $user))
|
{
| {
|
$this->verify_website();
|
$this->verify_website();
|
}
if($this->method == "insert" || array_key_exists('icq', $user))
{
$this->verify_icq();
| |
}
if($this->method == "insert" || (isset($user['birthday']) && is_array($user['birthday'])))
{
| }
if($this->method == "insert" || (isset($user['birthday']) && is_array($user['birthday'])))
{
|
| Zeile 1095 | Zeile 1099 |
|---|
$user = &$this->data;
|
$user = &$this->data;
|
$array = array('postnum', 'threadnum', 'avatar', 'avatartype', 'additionalgroups', 'displaygroup', 'icq', 'yahoo', 'skype', 'google', 'bday', 'signature', 'style', 'dateformat', 'timeformat', 'notepad');
| $array = array('postnum', 'threadnum', 'avatar', 'avatartype', 'additionalgroups', 'displaygroup', 'skype', 'google', 'bday', 'signature', 'style', 'dateformat', 'timeformat', 'notepad', 'regip', 'lastip', 'coppa_user');
|
foreach($array as $value)
{
if(!isset($user[$value]))
{
$user[$value] = '';
}
|
foreach($array as $value)
{
if(!isset($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(
| }
$this->user_insert_data = array(
|
| Zeile 1122 | Zeile 1141 |
|---|
"lastactive" => (int)$user['lastactive'],
"lastvisit" => (int)$user['lastvisit'],
"website" => $db->escape_string($user['website']),
|
"lastactive" => (int)$user['lastactive'],
"lastvisit" => (int)$user['lastvisit'],
"website" => $db->escape_string($user['website']),
|
"icq" => (int)$user['icq'],
"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 1152 | Zeile 1169 |
|---|
"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 1161 | Zeile 1179 |
|---|
"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 1282 | Zeile 1299 |
|---|
}
if(isset($user['email']))
{
|
}
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 1332 | Zeile 1349 |
|---|
if(isset($user['website']))
{
$this->user_update_data['website'] = $db->escape_string($user['website']);
|
if(isset($user['website']))
{
$this->user_update_data['website'] = $db->escape_string($user['website']);
|
}
if(isset($user['icq']))
{
$this->user_update_data['icq'] = (int)$user['icq'];
}
if(isset($user['yahoo']))
{
$this->user_update_data['yahoo'] = $db->escape_string($user['yahoo']);
| |
}
if(isset($user['skype']))
{
| }
if(isset($user['skype']))
{
|
| Zeile 1354 | Zeile 1363 |
|---|
$this->user_update_data['birthday'] = $user['bday'];
}
if(isset($user['birthdayprivacy']))
|
$this->user_update_data['birthday'] = $user['bday'];
}
if(isset($user['birthdayprivacy']))
|
{
| {
|
$this->user_update_data['birthdayprivacy'] = $db->escape_string($user['birthdayprivacy']);
}
if(isset($user['style']))
|
$this->user_update_data['birthdayprivacy'] = $db->escape_string($user['birthdayprivacy']);
}
if(isset($user['style']))
|
{
| {
|
$this->user_update_data['style'] = (int)$user['style'];
}
if(isset($user['timezone']))
|
$this->user_update_data['style'] = (int)$user['style'];
}
if(isset($user['timezone']))
|
{
| {
|
$this->user_update_data['timezone'] = $db->escape_string($user['timezone']);
}
if(isset($user['dateformat']))
| $this->user_update_data['timezone'] = $db->escape_string($user['timezone']);
}
if(isset($user['dateformat']))
|
| Zeile 1375 | Zeile 1384 |
|---|
}
if(isset($user['regip']))
{
|
}
if(isset($user['regip']))
{
|
$this->user_update_data['regip'] = $db->escape_string($user['regip']);
| $this->user_update_data['regip'] = $db->escape_binary($user['regip']);
}
if(isset($user['lastip']))
{
$this->user_update_data['lastip'] = $db->escape_binary($user['lastip']);
|
}
if(isset($user['language']))
{
| }
if(isset($user['language']))
{
|
| Zeile 1411 | Zeile 1424 |
|---|
$old_user = get_user($user['uid']);
// If old user has new pmnotice and new user has = yes, keep old value
|
$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)
| if(isset($this->user_update_data['pmnotice']) && $old_user['pmnotice'] == "2" && $this->user_update_data['pmnotice'] == 1)
|
{
unset($this->user_update_data['pmnotice']);
}
| {
unset($this->user_update_data['pmnotice']);
}
|
| Zeile 1445 | Zeile 1458 |
|---|
{
$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 1590 | Zeile 1603 |
|---|
$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_moderators();
$cache->update_forumsdisplay();
$cache->update_reportedcontent();
|
| Zeile 1749 | Zeile 1761 |
|---|
$update = array(
"website" => "",
"birthday" => "",
|
$update = array(
"website" => "",
"birthday" => "",
|
"icq" => "",
"yahoo" => "",
| |
"skype" => "",
"google" => "",
"usertitle" => "",
| "skype" => "",
"google" => "",
"usertitle" => "",
|
| Zeile 1792 | Zeile 1802 |
|---|
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 1817 | Zeile 1831 |
|---|
)
{
$imgsallowed = 0;
|
)
{
$imgsallowed = 0;
|
|
|
if($mybb->settings['sigimgcode'] == 1)
{
$imgsallowed = $mybb->settings['maxsigimages'];
| if($mybb->settings['sigimgcode'] == 1)
{
$imgsallowed = $mybb->settings['maxsigimages'];
|
| Zeile 1828 | Zeile 1842 |
|---|
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');
}
|
}
}
| }
}
|