Vergleich global.php - 1.8.5 - 1.8.10

Keine Änderungen Hinzugefügt Modifiziert Entfernt
Zeile 54	Zeile 54
$session->init(); $mybb->session = &$session;	$session->init(); $mybb->session = &$session;
$mybb->user['ismoderator'] = is_moderator('', '', $mybb->user['uid']);	$mybb->user['ismoderator'] = is_moderator(0, '', $mybb->user['uid']);
// Set our POST validation code here $mybb->post_code = generate_post_check();	// Set our POST validation code here $mybb->post_code = generate_post_check();
Zeile 111	Zeile 111
// The user used our new quick theme changer if(isset($mybb->input['theme']) && verify_post_check($mybb->get_input('my_post_key'), true)) {	// The user used our new quick theme changer if(isset($mybb->input['theme']) && verify_post_check($mybb->get_input('my_post_key'), true)) {
$mybb->user['style'] = $mybb->get_input('theme'); // If user is logged in, update their theme selection with the new one if($mybb->user['uid'])	// Set up user handler. require_once MYBB_ROOT.'inc/datahandlers/user.php'; $userhandler = new UserDataHandler('update'); $user = array( 'uid' => $mybb->user['uid'], 'style' => $mybb->get_input('theme', MyBB::INPUT_INT), 'usergroup' => $mybb->user['usergroup'], 'additionalgroups' => $mybb->user['additionalgroups'] ); $userhandler->set_data($user); // validate_user verifies the style if it is set in the data array. if($userhandler->validate_user())
{	{
if(isset($mybb->cookies['mybbtheme']))	$mybb->user['style'] = $user['style']; // If user is logged in, update their theme selection with the new one if($mybb->user['uid']) { if(isset($mybb->cookies['mybbtheme'])) { my_unsetcookie('mybbtheme'); } $userhandler->update_user(); } // Guest = cookie else
{	{
my_unsetcookie('mybbtheme');	my_setcookie('mybbtheme', $user['style']);
}	}
$db->update_query('users', array('style' => (int)$mybb->user['style']), "uid = '{$mybb->user['uid']}'"); } // Guest = cookie else { my_setcookie('mybbtheme', $mybb->get_input('theme'));
} } // Cookied theme!	} } // Cookied theme!
Zeile 141	Zeile 159
$loadstyle = "tid = '{$mybb->user['style']}'"; $load_from_user = 1;	$loadstyle = "tid = '{$mybb->user['style']}'"; $load_from_user = 1;
}	}
$valid = array( 'showthread.php',	$valid = array( 'showthread.php',
Zeile 155	Zeile 173
'printthread.php', 'moderation.php' );	'printthread.php', 'moderation.php' );

if(in_array($current_page, $valid)) { cache_forums();	if(in_array($current_page, $valid)) { cache_forums();

// If we're accessing a post, fetch the forum theme for it and if we're overriding it if(isset($mybb->input['pid']) && THIS_SCRIPT != "polls.php") {	// If we're accessing a post, fetch the forum theme for it and if we're overriding it if(isset($mybb->input['pid']) && THIS_SCRIPT != "polls.php") {
Zeile 171	Zeile 189
$style = $forum_cache[$fid]; $load_from_forum = 1; }	$style = $forum_cache[$fid]; $load_from_forum = 1; }
} // We have a thread id and a forum id, we can easily fetch the theme for this forum else if(isset($mybb->input['tid'])) { $query = $db->simple_select('threads', 'fid', "tid = '{$mybb->input['tid']}'", array('limit' => 1)); $fid = $db->fetch_field($query, 'fid'); if($fid) { $style = $forum_cache[$fid]; $load_from_forum = 1; }	} // We have a thread id and a forum id, we can easily fetch the theme for this forum else if(isset($mybb->input['tid'])) { $query = $db->simple_select('threads', 'fid', "tid = '{$mybb->input['tid']}'", array('limit' => 1)); $fid = $db->fetch_field($query, 'fid'); if($fid) { $style = $forum_cache[$fid]; $load_from_forum = 1; }
} // If we're accessing poll results, fetch the forum theme for it and if we're overriding it else if(isset($mybb->input['pid']) && THIS_SCRIPT == "polls.php")	} // If we're accessing poll results, fetch the forum theme for it and if we're overriding it else if(isset($mybb->input['pid']) && THIS_SCRIPT == "polls.php")
Zeile 195	Zeile 213
$style = $forum_cache[$fid]; $load_from_forum = 1; }	$style = $forum_cache[$fid]; $load_from_forum = 1; }
}	}
// We have a forum id - simply load the theme from it else if(isset($mybb->input['fid']) && isset($forum_cache[$mybb->input['fid']])) {	// We have a forum id - simply load the theme from it else if(isset($mybb->input['fid']) && isset($forum_cache[$mybb->input['fid']])) {
Zeile 209	Zeile 227
if(isset($style['style']) && $style['style'] > 0) { $style['style'] = (int)$style['style'];	if(isset($style['style']) && $style['style'] > 0) { $style['style'] = (int)$style['style'];

// This theme is forced upon the user, overriding their selection if($style['overridestyle'] == 1 \|\| !isset($mybb->user['style'])) { $loadstyle = "tid = '{$style['style']}'"; }	// This theme is forced upon the user, overriding their selection if($style['overridestyle'] == 1 \|\| !isset($mybb->user['style'])) { $loadstyle = "tid = '{$style['style']}'"; }
}	}
// After all of that no theme? Load the board default if(empty($loadstyle)) { $loadstyle = "def='1'";	// After all of that no theme? Load the board default if(empty($loadstyle)) { $loadstyle = "def='1'";
}	}
// Fetch the theme to load from the cache	// Fetch the theme to load from the cache
	if($loadstyle != "def='1'") { $query = $db->simple_select('themes', 'name, tid, properties, stylesheets, allowedgroups', $loadstyle, array('limit' => 1)); $theme = $db->fetch_array($query); if(isset($theme['tid']) && !$load_from_forum && !is_member($theme['allowedgroups']) && $theme['allowedgroups'] != 'all') { if($load_from_user == 1) { $db->update_query('users', array('style' => 0), "style='{$mybb->user['style']}' AND uid='{$mybb->user['uid']}'"); } if(isset($mybb->cookies['mybbtheme'])) { my_unsetcookie('mybbtheme'); } $loadstyle = "def='1'"; } }