Vergleich global.php - 1.6.1 - 1.6.5

Keine Änderungen Hinzugefügt Modifiziert Entfernt
Zeile 6	Zeile 6
* Website: http://mybb.com * License: http://mybb.com/about/license *	* Website: http://mybb.com * License: http://mybb.com/about/license *
* $Id: global.php 5016 2010-06-12 00:24:02Z RyanGordon $	* $Id: global.php 5640 2011-10-26 09:22:59Z Tomm $
*/ $working_dir = dirname(__FILE__);	*/ $working_dir = dirname(__FILE__);
Zeile 61	Zeile 61
$mybb->post_code = generate_post_check(); // Set and load the language	$mybb->post_code = generate_post_check(); // Set and load the language
if($mybb->input['language'] && $lang->language_exists($mybb->input['language']))	if($mybb->input['language'] && $lang->language_exists($mybb->input['language']) && verify_post_check($mybb->input['my_post_key'], true))
{ $mybb->settings['bblanguage'] = $mybb->input['language']; // If user is logged in, update their language selection with the new one if($mybb->user['uid']) {	{ $mybb->settings['bblanguage'] = $mybb->input['language']; // If user is logged in, update their language selection with the new one if($mybb->user['uid']) {
	if($mybb->cookies['mybblang']) { my_unsetcookie("mybblang"); }
$db->update_query("users", array("language" => $db->escape_string($mybb->settings['bblanguage'])), "uid='{$mybb->user['uid']}'");	$db->update_query("users", array("language" => $db->escape_string($mybb->settings['bblanguage'])), "uid='{$mybb->user['uid']}'");
}	}
// Guest = cookie else { my_setcookie("mybblang", $mybb->settings['bblanguage']); } $mybb->user['language'] = $mybb->settings['bblanguage'];	// Guest = cookie else { my_setcookie("mybblang", $mybb->settings['bblanguage']); } $mybb->user['language'] = $mybb->settings['bblanguage'];
}	}
// Cookied language!	// Cookied language!
else if($mybb->cookies['mybblang'] && $lang->language_exists($mybb->cookies['mybblang'])) {	else if(!$mybb->user['uid'] && $mybb->cookies['mybblang'] && $lang->language_exists($mybb->cookies['mybblang'])) {
$mybb->settings['bblanguage'] = $mybb->cookies['mybblang'];	$mybb->settings['bblanguage'] = $mybb->cookies['mybblang'];
}	}
else if(!isset($mybb->settings['bblanguage'])) { $mybb->settings['bblanguage'] = "english";	else if(!isset($mybb->settings['bblanguage'])) { $mybb->settings['bblanguage'] = "english";
}	}
// Load language $lang->set_language($mybb->settings['bblanguage']); $lang->load("global");	// Load language $lang->set_language($mybb->settings['bblanguage']); $lang->load("global");
Zeile 125	Zeile 130
if(in_array($current_page, $valid)) {	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($mybb->input['pid'])	// If we're accessing a post, fetch the forum theme for it and if we're overriding it if($mybb->input['pid'])
{ $query = $db->query(" SELECT f.style, f.overridestyle, p.* FROM ".TABLE_PREFIX."forums f LEFT JOIN ".TABLE_PREFIX."posts p ON(f.fid=p.fid) WHERE p.pid='".intval($mybb->input['pid'])."' LIMIT 1 "); $style = $db->fetch_array($query); $load_from_forum = 1; }	{ $query = $db->simple_select("posts", "fid", "pid = '".intval($mybb->input['pid'])."'", 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($mybb->input['tid']) {	// We have a thread id and a forum id, we can easily fetch the theme for this forum else if($mybb->input['tid']) {
$query = $db->query(" SELECT f.style, f.overridestyle, t.* FROM ".TABLE_PREFIX."forums f LEFT JOIN ".TABLE_PREFIX."threads t ON (f.fid=t.fid) WHERE t.tid='".intval($mybb->input['tid'])."' LIMIT 1 "); $style = $db->fetch_array($query); $load_from_forum = 1;	$query = $db->simple_select("threads", "fid", "tid = '".intval($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 forum id - simply load the theme from it else if($mybb->input['fid']) {	// We have a forum id - simply load the theme from it else if($mybb->input['fid']) {
cache_forums();
$style = $forum_cache[intval($mybb->input['fid'])]; $load_from_forum = 1; }	$style = $forum_cache[intval($mybb->input['fid'])]; $load_from_forum = 1; }
Zeile 225	Zeile 228
{ // Actually add the stylesheets to the list foreach($theme['stylesheets'][$stylesheet_script][$stylesheet_action] as $page_stylesheet)	{ // Actually add the stylesheets to the list foreach($theme['stylesheets'][$stylesheet_script][$stylesheet_action] as $page_stylesheet)
{	{
if($already_loaded[$page_stylesheet]) { continue;	if($already_loaded[$page_stylesheet]) { continue;
Zeile 334	Zeile 337
// User can access the admin cp and we're not hiding admin cp links, fetch it if($mybb->usergroup['cancp'] == 1 && $mybb->config['hide_admin_links'] != 1) {	// User can access the admin cp and we're not hiding admin cp links, fetch it if($mybb->usergroup['cancp'] == 1 && $mybb->config['hide_admin_links'] != 1) {
	$admin_dir = $config['admin_dir'];
eval("\$admincplink = \"".$templates->get("header_welcomeblock_member_admin")."\";"); }	eval("\$admincplink = \"".$templates->get("header_welcomeblock_member_admin")."\";"); }
Zeile 343	Zeile 347
} // Format the welcome back message	} // Format the welcome back message
$lang->welcome_back = $lang->sprintf($lang->welcome_back, $mybb->user['username'], $lastvisit);	$lang->welcome_back = $lang->sprintf($lang->welcome_back, build_profile_link($mybb->user['username'], $mybb->user['uid']), $lastvisit);
// Tell the user their PM usage $lang->welcome_pms_usage = $lang->sprintf($lang->welcome_pms_usage, my_number_format($mybb->user['pms_unread']), my_number_format($mybb->user['pms_total']));	// Tell the user their PM usage $lang->welcome_pms_usage = $lang->sprintf($lang->welcome_pms_usage, my_number_format($mybb->user['pms_unread']), my_number_format($mybb->user['pms_total']));
Zeile 505	Zeile 509
if($mybb->settings['showvernum'] == 1) { $mybbversion = ' '.$mybb->version;	if($mybb->settings['showvernum'] == 1) { $mybbversion = ' '.$mybb->version;
} else {	} else {
$mybbversion = ''; }	$mybbversion = ''; }
Zeile 648	Zeile 652
else { error_no_permission();	else { error_no_permission();
	} } // Find out if this user of ours is using a banned email address. // If they are, redirect them to change it if($mybb->user['uid'] && is_banned_email($mybb->user['email']) && $mybb->settings['emailkeep'] != 1) { if(THIS_SCRIPT != "usercp.php" \|\| THIS_SCRIPT == "usercp.php" && $mybb->input['action'] != "email" && $mybb->input['action'] != "do_email") { redirect("usercp.php?action=email"); } else if($mybb->request_method != "post") { $banned_email_error = inline_error(array($lang->banned_email_warning));
} }	} }