Vergleich global.php - 1.8.5 - 1.8.8

  Keine Änderungen   Hinzugefügt   Modifiziert   Entfernt
Zeile 54Zeile 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 111Zeile 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 141Zeile 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 155Zeile 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 171Zeile 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 195Zeile 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 209Zeile 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'";
}
}


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');

	$theme = $cache->read('default_theme');

}
else
{
$query = $db->simple_select('themes', 'name, tid, properties, stylesheets', $loadstyle, array('limit' => 1));
$theme = $db->fetch_array($query);


$load_from_forum = $load_from_user = 0;




}

// No theme was found - we attempt to load the master or any other theme

}

// No theme was found - we attempt to load the master or any other theme

Zeile 326Zeile 363
}
unset($actions);


}
unset($actions);


if(!empty($theme_stylesheets))

if(!empty($theme_stylesheets) && is_array($theme['disporder']))

{
foreach($theme['disporder'] as $style_name => $order)
{

{
foreach($theme['disporder'] as $style_name => $order)
{

Zeile 338Zeile 375
}

// 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']))

{
// If a language directory for the current language exists within the theme - we use it
if(!empty($mybb->user['language']))

Zeile 412Zeile 449
	$templatelist = '';
}


	$templatelist = '';
}


$templatelist .= "headerinclude,header,footer,gobutton,htmldoctype,header_welcomeblock_member,header_welcomeblock_guest,header_welcomeblock_member_admin,global_pm_alert,global_unreadreports,error,footer_languageselect_option,footer_contactus";
$templatelist .= ",global_pending_joinrequests,global_awaiting_activation,nav,nav_sep,nav_bit,nav_sep_active,nav_bit_active,footer_languageselect,footer_themeselect,header_welcomeblock_member_moderator,redirect,header_menu_calendar,nav_dropdown,footer_themeselector,task_image";
$templatelist .= ",global_boardclosed_warning,global_bannedwarning,error_inline,error_nopermission_loggedin,error_nopermission,debug_summary,header_quicksearch,header_menu_search,header_menu_portal,header_menu_memberlist,usercp_themeselector_option,smilie,global_board_offline_modal";
$templatelist .= ",video_dailymotion_embed,video_facebook_embed,video_liveleak_embed,video_metacafe_embed,video_myspacetv_embed,video_veoh_embed,video_vimeo_embed,video_yahoo_embed,video_youtube_embed";



$templatelist .= "headerinclude,header,footer,gobutton,htmldoctype,header_welcomeblock_member,header_welcomeblock_guest,header_welcomeblock_member_moderator,header_welcomeblock_member_admin,footer_languageselect_option";
$templatelist .= ",global_pending_joinrequests,global_awaiting_activation,nav,nav_sep,nav_bit,nav_sep_active,nav_bit_active,footer_languageselect,footer_themeselect,header_menu_calendar,global_unreadreports,smilie";
$templatelist .= ",global_boardclosed_warning,global_bannedwarning,error_inline,error_nopermission_loggedin,error_nopermission,header_quicksearch,header_menu_search,header_menu_portal,header_menu_memberlist,redirect";
$templatelist .= ",video_dailymotion_embed,video_facebook_embed,video_liveleak_embed,video_metacafe_embed,video_myspacetv_embed,video_veoh_embed,video_vimeo_embed,video_yahoo_embed,video_youtube_embed,global_dst_detection";
$templatelist .= ",smilieinsert_row,smilieinsert_row_empty,smilieinsert,smilieinsert_getmore,smilieinsert_smilie,global_board_offline_modal,footer_themeselector,task_image,usercp_themeselector_option,debug_summary";
$templatelist .= ",mycode_code,mycode_email,mycode_img,mycode_php,mycode_quote_post,mycode_size_int,mycode_url,global_no_permission_modal,global_boardclosed_reason,nav_dropdown,footer_contactus,global_pm_alert,error";

$templates->cache($db->escape_string($templatelist));

// Set the current date and time now

$templates->cache($db->escape_string($templatelist));

// Set the current date and time now

Zeile 445Zeile 484

// Prepare the main templates for use
$admincplink = $modcplink = '';


// Prepare the main templates for use
$admincplink = $modcplink = '';





// Load appropriate welcome block for the current logged in user
if($mybb->user['uid'] != 0)
{

// Load appropriate welcome block for the current logged in user
if($mybb->user['uid'] != 0)
{

Zeile 462Zeile 501
	}

// Format the welcome back message

	}

// Format the welcome back message

	$lang->welcome_back = $lang->sprintf($lang->welcome_back, build_profile_link($mybb->user['username'], $mybb->user['uid']), $lastvisit);

	$lang->welcome_back = $lang->sprintf($lang->welcome_back, build_profile_link(htmlspecialchars_uni($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 552Zeile 591

$unreadreports = '';
// This user is a moderator, super moderator or administrator


$unreadreports = '';
// This user is a moderator, super moderator or administrator

if($mybb->usergroup['cancp'] == 1 || ($mybb->user['ismoderator'] && $mybb->usergroup['canmodcp'] == 1 && $mybb->usergroup['canmanagereportedcontent'] == 1))

if($mybb->settings['reportmethod'] == "db" && ($mybb->usergroup['cancp'] == 1 || ($mybb->user['ismoderator'] && $mybb->usergroup['canmodcp'] == 1 && $mybb->usergroup['canmanagereportedcontent'] == 1)))

{
// Only worth checking if we are here because we have ACP permissions and the other condition fails
if($mybb->usergroup['cancp'] == 1 && !($mybb->user['ismoderator'] && $mybb->usergroup['canmodcp'] == 1 && $mybb->usergroup['canmanagereportedcontent'] == 1))

{
// Only worth checking if we are here because we have ACP permissions and the other condition fails
if($mybb->usergroup['cancp'] == 1 && !($mybb->user['ismoderator'] && $mybb->usergroup['canmodcp'] == 1 && $mybb->usergroup['canmanagereportedcontent'] == 1))

Zeile 589Zeile 628
	{
$can_access_moderationqueue = false;
}

	{
$can_access_moderationqueue = false;
}

	



	if($can_access_moderationqueue || ($mybb->user['ismoderator'] && $mybb->usergroup['canmodcp'] == 1 && $mybb->usergroup['canmanagereportedcontent'] == 1))
{
// Read the reported content cache

	if($can_access_moderationqueue || ($mybb->user['ismoderator'] && $mybb->usergroup['canmodcp'] == 1 && $mybb->usergroup['canmanagereportedcontent'] == 1))
{
// Read the reported content cache

Zeile 706Zeile 745
	}
else
{

	}
else
{

 
		$pm['fromusername'] = htmlspecialchars_uni($pm['fromusername']);

		$user_text = build_profile_link($pm['fromusername'], $pm['fromuid']);
}


		$user_text = build_profile_link($pm['fromusername'], $pm['fromuid']);
}


Zeile 747Zeile 787
	{
$awaitingusers = my_number_format($awaitingusers);
}

	{
$awaitingusers = my_number_format($awaitingusers);
}

	



	if($awaitingusers > 0)
{
if($awaitingusers == 1)

	if($awaitingusers > 0)
{
if($awaitingusers == 1)

Zeile 847Zeile 887
$contact_us = '';
if(($mybb->settings['contactlink'] == "contact.php" && $mybb->settings['contact'] == 1 && ($mybb->settings['contact_guests'] != 1 && $mybb->user['uid'] == 0 || $mybb->user['uid'] > 0)) || $mybb->settings['contactlink'] != "contact.php")
{

$contact_us = '';
if(($mybb->settings['contactlink'] == "contact.php" && $mybb->settings['contact'] == 1 && ($mybb->settings['contact_guests'] != 1 && $mybb->user['uid'] == 0 || $mybb->user['uid'] > 0)) || $mybb->settings['contactlink'] != "contact.php")
{

	if(my_substr($mybb->settings['contactlink'], 0, 1) != '/' && my_substr($mybb->settings['contactlink'], 0, 7) != 'http://' && my_substr($mybb->settings['contactlink'], 0, 8) != 'https://' && my_substr($mybb->settings['contactlink'], 0, 7) != 'mailto:')

	if(!my_validate_url($mybb->settings['contactlink'], true) && my_substr($mybb->settings['contactlink'], 0, 7) != 'mailto:')

	{
$mybb->settings['contactlink'] = $mybb->settings['bburl'].'/'.$mybb->settings['contactlink'];
}

	{
$mybb->settings['contactlink'] = $mybb->settings['bburl'].'/'.$mybb->settings['contactlink'];
}

Zeile 859Zeile 899
$auto_dst_detection = '';
if($mybb->user['uid'] > 0 && $mybb->user['dstcorrection'] == 2)
{

$auto_dst_detection = '';
if($mybb->user['uid'] > 0 && $mybb->user['dstcorrection'] == 2)
{

	$auto_dst_detection = "<script type=\"text/javascript\">if(MyBB) { $([document, window]).bind(\"load\", function() { MyBB.detectDSTChange('".($mybb->user['timezone']+$mybb->user['dst'])."'); }); }</script>\n";


	$timezone = $mybb->user['timezone'] + $mybb->user['dst'];
eval('$auto_dst_detection = "'.$templates->get('global_dst_detection').'";');

}

}

 


eval('$footer = "'.$templates->get('footer').'";');

// Add our main parts to the navigation

eval('$footer = "'.$templates->get('footer').'";');

// Add our main parts to the navigation

Zeile 903Zeile 945
		$mybb->settings['boardclosed_reason'] = $lang->boardclosed_reason;
}


		$mybb->settings['boardclosed_reason'] = $lang->boardclosed_reason;
}


	$lang->error_boardclosed .= "<blockquote>{$mybb->settings['boardclosed_reason']}</blockquote>";


	eval('$reason = "'.$templates->get('global_boardclosed_reason').'";');
$lang->error_boardclosed .= $reason;





	if(!$mybb->get_input('modal')) 

	if(!$mybb->get_input('modal'))

	{
error($lang->error_boardclosed);
}

	{
error($lang->error_boardclosed);
}

Zeile 971Zeile 1014
	}
}


	}
}


 
$output = '';
$notallowed = false;

if($mybb->usergroup['canview'] != 1)
{
// Check pages allowable even when not allowed to view board

if($mybb->usergroup['canview'] != 1)
{
// Check pages allowable even when not allowed to view board

Zeile 981Zeile 1026
			$allowable_actions = explode(',', ALLOWABLE_PAGE);
if(!in_array($mybb->get_input('action'), $allowable_actions))
{

			$allowable_actions = explode(',', ALLOWABLE_PAGE);
if(!in_array($mybb->get_input('action'), $allowable_actions))
{

				error_no_permission();

				$notallowed = true;

			}

unset($allowable_actions);
}
else if(ALLOWABLE_PAGE !== 1)
{

			}

unset($allowable_actions);
}
else if(ALLOWABLE_PAGE !== 1)
{

			error_no_permission();
}
}

			$notallowed = true;
}
}

	else
{

	else
{

		error_no_permission();















		$notallowed = true;
}

if($notallowed == true)
{
if(!$mybb->get_input('modal'))
{
error_no_permission();
}
else
{
eval('$output = "'.$templates->get('global_no_permission_modal', 1, 0).'";');
echo($output);
exit;
}

	}
}


	}
}