"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "Upload/inc/datahandlers/user.php" between
mybb_1822.zip and mybb_1823.zip

About: MyBB is a multilingual, standards-compliant and free forum (discussion board) software.

user.php  (mybb_1822):user.php  (mybb_1823)
skipping to change at line 694 skipping to change at line 694
if($options['dstcorrection'] == 1) if($options['dstcorrection'] == 1)
{ {
$options['dst'] = 1; $options['dst'] = 1;
} }
elseif($options['dstcorrection'] == 0) elseif($options['dstcorrection'] == 0)
{ {
$options['dst'] = 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'] = '';
{
$options['threadmode'] = 'threaded';
}
else
{
$options['threadmode'] = 'linear';
}
} }
// Verify the "threads per page" option. // Verify the "threads per page" option.
if($this->method == "insert" || (array_key_exists('tpp', $options ) && $mybb->settings['usertppoptions'])) if($this->method == "insert" || (array_key_exists('tpp', $options ) && $mybb->settings['usertppoptions']))
{ {
if(!isset($options['tpp'])) if(!isset($options['tpp']))
{ {
$options['tpp'] = 0; $options['tpp'] = 0;
} }
$explodedtpp = explode(",", $mybb->settings['usertppoptio ns']); $explodedtpp = explode(",", $mybb->settings['usertppoptio ns']);
skipping to change at line 931 skipping to change at line 924
} }
/** /**
* Verifies if the user timezone is valid. * Verifies if the user timezone is valid.
* If the timezone is invalid, the board default is used. * If the timezone is invalid, the board default is used.
* *
* @return boolean True when timezone was valid, false otherwise * @return boolean True when timezone was valid, false otherwise
*/ */
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(!array_key_exists($user['timezone'], $timezones))
{ {
$user['timezone'] = $mybb->settings['timezoneoffset']; $user['timezone'] = $mybb->settings['timezoneoffset'];
return false; return false;
} }
skipping to change at line 1174 skipping to change at line 1169
"buddyrequestsauto" => (int)$user['options']['buddyreques tsauto'], "buddyrequestsauto" => (int)$user['options']['buddyreques tsauto'],
"away" => (int)$user['away']['away'], "away" => (int)$user['away']['away'],
"awaydate" => (int)$user['away']['date'], "awaydate" => (int)$user['away']['date'],
"returndate" => $user['away']['returndate'], "returndate" => $user['away']['returndate'],
"awayreason" => $db->escape_string($user['away']['awayrea son']), "awayreason" => $db->escape_string($user['away']['awayrea son']),
"notepad" => $db->escape_string($user['notepad']), "notepad" => $db->escape_string($user['notepad']),
"referrer" => (int)$user['referrer_uid'], "referrer" => (int)$user['referrer_uid'],
"referrals" => 0, "referrals" => 0,
"buddylist" => '', "buddylist" => '',
"ignorelist" => '', "ignorelist" => '',
"pmfolders" => '', "pmfolders" => "0**$%%$1**$%%$2**$%%$3**$%%$4**",
"notepad" => '', "notepad" => '',
"warningpoints" => 0, "warningpoints" => 0,
"moderateposts" => 0, "moderateposts" => 0,
"moderationtime" => 0, "moderationtime" => 0,
"suspendposting" => 0, "suspendposting" => 0,
"suspensiontime" => 0, "suspensiontime" => 0,
"coppauser" => (int)$user['coppa_user'], "coppauser" => (int)$user['coppa_user'],
"classicpostbit" => (int)$user['options']['classicpostbit '], "classicpostbit" => (int)$user['options']['classicpostbit '],
"usernotes" => '' "usernotes" => ''
); );
skipping to change at line 1594 skipping to change at line 1589
// Update forum stats // Update forum stats
update_stats(array('numusers' => '-'.$this->deleted_users)); update_stats(array('numusers' => '-'.$this->deleted_users));
$this->return_values = array( $this->return_values = array(
"deleted_users" => $this->deleted_users "deleted_users" => $this->deleted_users
); );
$plugins->run_hooks("datahandler_user_delete_end", $this); $plugins->run_hooks("datahandler_user_delete_end", $this);
// Update cache // Update cache
$cache->update_banned();
$cache->update_moderators(); $cache->update_moderators();
$cache->update_forumsdisplay(); $cache->update_forumsdisplay();
$cache->update_reportedcontent(); $cache->update_reportedcontent();
$cache->update_awaitingactivation(); $cache->update_awaitingactivation();
$cache->update_birthdays(); $cache->update_birthdays();
return $this->return_values; return $this->return_values;
} }
/** /**
skipping to change at line 1804 skipping to change at line 1798
global $mybb, $parser; global $mybb, $parser;
if(!isset($parser)) if(!isset($parser))
{ {
require_once MYBB_ROOT."inc/class_parser.php"; require_once MYBB_ROOT."inc/class_parser.php";
$parser = new postParser; $parser = new postParser;
} }
$parser_options = array( $parser_options = array(
'allow_html' => $mybb->settings['sightml'], 'allow_html' => $mybb->settings['sightml'],
'filter_badwords' => 1,
'allow_mycode' => $mybb->settings['sigmycode'], 'allow_mycode' => $mybb->settings['sigmycode'],
'allow_smilies' => $mybb->settings['sigsmilies'], 'allow_smilies' => $mybb->settings['sigsmilies'],
'allow_imgcode' => $mybb->settings['sigimgcode'], 'allow_imgcode' => $mybb->settings['sigimgcode'],
"filter_badwords" => 1 "filter_badwords" => 1
); );
$parsed_sig = $parser->parse_message($this->data['signature'], $p arser_options); $parsed_sig = $parser->parse_message($this->data['signature'], $p arser_options);
if((($mybb->settings['sigimgcode'] == 0 && $mybb->settings['sigsm ilies'] != 1) && if((($mybb->settings['sigimgcode'] == 0 && $mybb->settings['sigsm ilies'] != 1) &&
substr_count($parsed_sig, "<img") > 0) || substr_count($parsed_sig, "<img") > 0) ||
 End of changes. 6 change blocks. 
12 lines changed or deleted 5 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)