Vergleich global.php - 1.8.4 - 1.8.8

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 224	Zeile 242
} // 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'"; } }
if($loadstyle == "def='1'") { if(!$cache->read('default_theme')) { $cache->update_default_theme(); }	if($loadstyle == "def='1'") { if(!$cache->read('default_theme')) { $cache->update_default_theme(); }
$theme = $cache->read('default_theme'); } else { $query = $db->simple_select('themes', 'name, tid, properties, stylesheets', $loadstyle, array('limit' => 1)); $theme = $db->fetch_array($query); }	$theme = $cache->read('default_theme'); $load_from_forum = $load_from_user = 0; }
// No theme was found - we attempt to load the master or any other theme if(!isset($theme['tid']) \|\| isset($theme['tid']) && !$theme['tid'])	// No theme was found - we attempt to load the master or any other theme if(!isset($theme['tid']) \|\| isset($theme['tid']) && !$theme['tid'])
Zeile 298	Zeile 335
else { $stylesheet_url = $mybb->get_asset_url($page_stylesheet);	else { $stylesheet_url = $mybb->get_asset_url($page_stylesheet);
}	}
if($mybb->settings['minifycss']) {	if($mybb->settings['minifycss']) {
Zeile 320	Zeile 357
} $already_loaded[$page_stylesheet] = 1;	} $already_loaded[$page_stylesheet] = 1;
} } }	} } }
} unset($actions);	} unset($actions);
if(!empty($theme_stylesheets))	if(!empty($theme_stylesheets) && is_array($theme['disporder']))
{ foreach($theme['disporder'] as $style_name => $order) { if(!empty($theme_stylesheets[$style_name])) { $stylesheets .= $theme_stylesheets[$style_name];	{ foreach($theme['disporder'] as $style_name => $order) { if(!empty($theme_stylesheets[$style_name])) { $stylesheets .= $theme_stylesheets[$style_name];
} } }	} } }
// Are we linking to a remote theme server?	// Are we linking to a remote theme server?
if(my_substr($theme['imgdir'], 0, 7) == 'http://' \|\| my_substr($theme['imgdir'], 0, 8) == 'https://')	if(my_validate_url($theme['imgdir'])) { // If a language directory for the current language exists within the theme - we use it if(!empty($mybb->user['language'])) { $theme['imglangdir'] = $theme['imgdir'].'/'.$mybb->user['language']; } else { // Check if a custom language directory exists for this theme if(!empty($mybb->settings['bblanguage'])) { $theme['imglangdir'] = $theme['imgdir'].'/'.$mybb->settings['bblanguage']; } // Otherwise, the image language directory is the same as the language directory for the theme else { $theme['imglangdir'] = $theme['imgdir']; } } } else
{	{
	$img_directory = $theme['imgdir']; if($mybb->settings['usecdn'] && !empty($mybb->settings['cdnpath'])) { $img_directory = rtrim($mybb->settings['cdnpath'], '/') . '/' . ltrim($theme['imgdir'], '/'); } if(!@is_dir($img_directory)) { $theme['imgdir'] = 'images'; }
// If a language directory for the current language exists within the theme - we use it	// If a language directory for the current language exists within the theme - we use it
if(!empty($mybb->user['language'])) {	if(!empty($mybb->user['language']) && is_dir($img_directory.'/'.$mybb->user['language'])) {
$theme['imglangdir'] = $theme['imgdir'].'/'.$mybb->user['language']; } else { // Check if a custom language directory exists for this theme	$theme['imglangdir'] = $theme['imgdir'].'/'.$mybb->user['language']; } else { // Check if a custom language directory exists for this theme
if(!empty($mybb->settings['bblanguage']))	if(is_dir($img_directory.'/'.$mybb->settings['bblanguage']))
{ $theme['imglangdir'] = $theme['imgdir'].'/'.$mybb->settings['bblanguage']; }	{ $theme['imglangdir'] = $theme['imgdir'].'/'.$mybb->settings['bblanguage']; }
Zeile 357	Zeile 427