Vergleich global.php - 1.8.8 - 1.8.13

  Keine Änderungen   Hinzugefügt   Modifiziert   Entfernt
Zeile 449Zeile 449
	$templatelist = '';
}


	$templatelist = '';
}


$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";


$templatelist .= "headerinclude,header,footer,gobutton,htmldoctype,header_welcomeblock_member,header_welcomeblock_member_user,header_welcomeblock_member_moderator,header_welcomeblock_member_admin,error";
$templatelist .= ",global_pending_joinrequests,global_awaiting_activation,nav,nav_sep,nav_bit,nav_sep_active,nav_bit_active,footer_languageselect,footer_themeselect,global_unreadreports,footer_contactus";
$templatelist .= ",global_boardclosed_warning,global_bannedwarning,error_inline,error_nopermission_loggedin,error_nopermission,global_pm_alert,header_menu_search,header_menu_portal,redirect,footer_languageselect_option";
$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,debug_summary";
$templatelist .= ",smilieinsert_row,smilieinsert_row_empty,smilieinsert,smilieinsert_getmore,smilieinsert_smilie,global_board_offline_modal,footer_themeselector,task_image,usercp_themeselector_option,php_warnings";
$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,global_remote_avatar_notice";
$templatelist .= ",header_welcomeblock_member_pms,header_welcomeblock_member_search,header_welcomeblock_guest,header_menu_calendar,header_menu_memberlist,global_dst_detection,header_quicksearch,smilie";

$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 483Zeile 484
}

// Prepare the main templates for use

}

// Prepare the main templates for use

$admincplink = $modcplink = '';

$admincplink = $modcplink = $usercplink = '';


// 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 498Zeile 499
	if($mybb->usergroup['canmodcp'] == 1)
{
eval('$modcplink = "'.$templates->get('header_welcomeblock_member_moderator').'";');

	if($mybb->usergroup['canmodcp'] == 1)
{
eval('$modcplink = "'.$templates->get('header_welcomeblock_member_moderator').'";');

 
	}

if($mybb->usergroup['canusercp'] == 1)
{
eval('$usercplink = "'.$templates->get('header_welcomeblock_member_user').'";');

	}

// Format the welcome back message
$lang->welcome_back = $lang->sprintf($lang->welcome_back, build_profile_link(htmlspecialchars_uni($mybb->user['username']), $mybb->user['uid']), $lastvisit);

	}

// Format the welcome back message
$lang->welcome_back = $lang->sprintf($lang->welcome_back, build_profile_link(htmlspecialchars_uni($mybb->user['username']), $mybb->user['uid']), $lastvisit);










$searchlink = '';
if($mybb->usergroup['cansearch'] == 1)
{
eval('$searchlink = "'.$templates->get('header_welcomeblock_member_search').'";');
}


	// Tell the user their PM usage

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








	$pmslink = '';
if($mybb->settings['enablepms'] != 0 && $mybb->usergroup['canusepms'] == 1)
{
$lang->welcome_pms_usage = $lang->sprintf($lang->welcome_pms_usage, my_number_format($mybb->user['pms_unread']), my_number_format($mybb->user['pms_total']));

eval('$pmslink = "'.$templates->get('header_welcomeblock_member_pms').'";');
}


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

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

}

}

// Otherwise, we have a guest
else
{

// Otherwise, we have a guest
else
{

Zeile 526Zeile 545
			break;
}
eval('$welcomeblock = "'.$templates->get('header_welcomeblock_guest').'";');

			break;
}
eval('$welcomeblock = "'.$templates->get('header_welcomeblock_guest').'";');

}


}


// Display menu links and quick search if user has permission
$menu_search = $menu_memberlist = $menu_portal = $menu_calendar = $quicksearch = '';
if($mybb->usergroup['cansearch'] == 1)

// Display menu links and quick search if user has permission
$menu_search = $menu_memberlist = $menu_portal = $menu_calendar = $quicksearch = '';
if($mybb->usergroup['cansearch'] == 1)

Zeile 542Zeile 561
}

if($mybb->settings['enablecalendar'] == 1 && $mybb->usergroup['canviewcalendar'] == 1)

}

if($mybb->settings['enablecalendar'] == 1 && $mybb->usergroup['canviewcalendar'] == 1)

{

{

	eval('$menu_calendar = "'.$templates->get('header_menu_calendar').'";');
}

if($mybb->settings['portal'] == 1)

	eval('$menu_calendar = "'.$templates->get('header_menu_calendar').'";');
}

if($mybb->settings['portal'] == 1)

{

{

	eval('$menu_portal = "'.$templates->get('header_menu_portal').'";');
}


	eval('$menu_portal = "'.$templates->get('header_menu_portal').'";');
}


Zeile 557Zeile 576
if($mybb->user['uid'] != 0 && is_array($groupleaders) && array_key_exists($mybb->user['uid'], $groupleaders))
{
$groupleader = $groupleaders[$mybb->user['uid']];

if($mybb->user['uid'] != 0 && is_array($groupleaders) && array_key_exists($mybb->user['uid'], $groupleaders))
{
$groupleader = $groupleaders[$mybb->user['uid']];





	$gids = "'0'";
foreach($groupleader as $user)
{
if($user['canmanagerequests'] != 1)

	$gids = "'0'";
foreach($groupleader as $user)
{
if($user['canmanagerequests'] != 1)

		{

		{

			continue;
}


			continue;
}


Zeile 572Zeile 591

$query = $db->simple_select('joinrequests', 'COUNT(uid) as total', "gid IN ({$gids}) AND invite='0'");
$total_joinrequests = $db->fetch_field($query, 'total');


$query = $db->simple_select('joinrequests', 'COUNT(uid) as total', "gid IN ({$gids}) AND invite='0'");
$total_joinrequests = $db->fetch_field($query, 'total');





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

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

Zeile 583Zeile 602
		{
$total_joinrequests = my_number_format($total_joinrequests);
$lang->pending_joinrequests = $lang->sprintf($lang->pending_joinrequests, $total_joinrequests);

		{
$total_joinrequests = my_number_format($total_joinrequests);
$lang->pending_joinrequests = $lang->sprintf($lang->pending_joinrequests, $total_joinrequests);

		}


		}


		eval('$pending_joinrequests = "'.$templates->get('global_pending_joinrequests').'";');
}
}

		eval('$pending_joinrequests = "'.$templates->get('global_pending_joinrequests').'";');
}
}

Zeile 595Zeile 614
{
// 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))

	{

	{

		// First we check if the user's a super admin: if yes, we don't care about permissions
$can_access_moderationqueue = true;

		// First we check if the user's a super admin: if yes, we don't care about permissions
$can_access_moderationqueue = true;

		$is_super_admin = is_super_admin($recipient['uid']);

		$is_super_admin = is_super_admin($mybb->user['uid']);

		if(!$is_super_admin)
{
// Include admin functions
if(!file_exists(MYBB_ROOT.$mybb->config['admin_dir']."/inc/functions.php"))
{
$can_access_moderationqueue = false;

		if(!$is_super_admin)
{
// Include admin functions
if(!file_exists(MYBB_ROOT.$mybb->config['admin_dir']."/inc/functions.php"))
{
$can_access_moderationqueue = false;

			}


			}


			require_once MYBB_ROOT.$mybb->config['admin_dir']."/inc/functions.php";

// Verify if we have permissions to access forum-moderation_queue

			require_once MYBB_ROOT.$mybb->config['admin_dir']."/inc/functions.php";

// Verify if we have permissions to access forum-moderation_queue

Zeile 627Zeile 646
	else
{
$can_access_moderationqueue = false;

	else
{
$can_access_moderationqueue = false;

	}

	}


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


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





		// 0 or more reported items currently exist
if($reported['unread'] > 0)
{

		// 0 or more reported items currently exist
if($reported['unread'] > 0)
{

Zeile 643Zeile 662
				$unread = (int)$reported['unread'];
}
else

				$unread = (int)$reported['unread'];
}
else

			{

			{

				$unread = 0;
$query = $db->simple_select('reportedcontent', 'id3', "reportstatus='0' AND (type = 'post' OR type = '')");

while($fid = $db->fetch_field($query, 'id3'))

				$unread = 0;
$query = $db->simple_select('reportedcontent', 'id3', "reportstatus='0' AND (type = 'post' OR type = '')");

while($fid = $db->fetch_field($query, 'id3'))

				{

				{

					if(is_moderator($fid, "canmanagereportedposts"))
{
++$unread;
}

					if(is_moderator($fid, "canmanagereportedposts"))
{
++$unread;
}

				}
}

				}
}


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


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

				{

				{

					$lang->unread_reports = $lang->unread_report;
}
else

					$lang->unread_reports = $lang->unread_report;
}
else

Zeile 669Zeile 688

eval('$unreadreports = "'.$templates->get('global_unreadreports').'";');
}


eval('$unreadreports = "'.$templates->get('global_unreadreports').'";');
}

		}

		}

	}
}


	}
}


Zeile 696Zeile 715

if($ban['lifted'] > 0)
{


if($ban['lifted'] > 0)
{

			$banlift = my_date($mybb->settings['dateformat'], $ban['lifted']) . $lang->comma . my_date($mybb->settings['timeformat'], $ban['lifted']);

			$banlift = my_date('normal', $ban['lifted']);

		}
}


		}
}


Zeile 712Zeile 731

// Display a nice warning to the user
eval('$bannedwarning = "'.$templates->get('global_bannedwarning').'";');


// Display a nice warning to the user
eval('$bannedwarning = "'.$templates->get('global_bannedwarning').'";');

}

}


$lang->ajax_loading = str_replace("'", "\\'", $lang->ajax_loading);



$lang->ajax_loading = str_replace("'", "\\'", $lang->ajax_loading);


Zeile 721Zeile 740
if(isset($mybb->user['pmnotice']) && $mybb->user['pmnotice'] == 2 && $mybb->user['pms_unread'] > 0 && $mybb->settings['enablepms'] != 0 && $mybb->usergroup['canusepms'] != 0 && $mybb->usergroup['canview'] != 0 && ($current_page != "private.php" || $mybb->get_input('action') != "read"))
{
if(!isset($parser))

if(isset($mybb->user['pmnotice']) && $mybb->user['pmnotice'] == 2 && $mybb->user['pms_unread'] > 0 && $mybb->settings['enablepms'] != 0 && $mybb->usergroup['canusepms'] != 0 && $mybb->usergroup['canview'] != 0 && ($current_page != "private.php" || $mybb->get_input('action') != "read"))
{
if(!isset($parser))

	{

	{

		require_once MYBB_ROOT.'inc/class_parser.php';
$parser = new postParser;
}

		require_once MYBB_ROOT.'inc/class_parser.php';
$parser = new postParser;
}

Zeile 752Zeile 771
	if($mybb->user['pms_unread'] == 1)
{
$privatemessage_text = $lang->sprintf($lang->newpm_notice_one, $user_text, $mybb->settings['bburl'], $pm['pmid'], htmlspecialchars_uni($pm['subject']));

	if($mybb->user['pms_unread'] == 1)
{
$privatemessage_text = $lang->sprintf($lang->newpm_notice_one, $user_text, $mybb->settings['bburl'], $pm['pmid'], htmlspecialchars_uni($pm['subject']));

	}
else
{

	}
else
{

		$privatemessage_text = $lang->sprintf($lang->newpm_notice_multiple, $mybb->user['pms_unread'], $user_text, $mybb->settings['bburl'], $pm['pmid'], htmlspecialchars_uni($pm['subject']));
}
eval('$pm_notice = "'.$templates->get('global_pm_alert').'";');

		$privatemessage_text = $lang->sprintf($lang->newpm_notice_multiple, $mybb->user['pms_unread'], $user_text, $mybb->settings['bburl'], $pm['pmid'], htmlspecialchars_uni($pm['subject']));
}
eval('$pm_notice = "'.$templates->get('global_pm_alert').'";');

 
}

$remote_avatar_notice = '';
if(($mybb->user['avatartype'] === 'remote' || $mybb->user['avatartype'] === 'gravatar') && !$mybb->settings['allowremoteavatars'])
{
eval('$remote_avatar_notice = "'.$templates->get('global_remote_avatar_notice').'";');

}

if($mybb->settings['awactialert'] == 1 && $mybb->usergroup['cancp'] == 1)

}

if($mybb->settings['awactialert'] == 1 && $mybb->usergroup['cancp'] == 1)

Zeile 838Zeile 863
if($task_cache['nextrun'] <= TIME_NOW)
{
eval("\$task_image = \"".$templates->get("task_image")."\";");

if($task_cache['nextrun'] <= TIME_NOW)
{
eval("\$task_image = \"".$templates->get("task_image")."\";");

 
}

// Post code
$post_code_string = '';
if($mybb->user['uid'])
{
$post_code_string = '&amp;my_post_key='.$mybb->post_code;

}

// Are we showing the quick language selection box?

}

// Are we showing the quick language selection box?

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

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

	$timezone = $mybb->user['timezone'] + $mybb->user['dst'];

	$timezone = (float)$mybb->user['timezone'] + $mybb->user['dst'];

	eval('$auto_dst_detection = "'.$templates->get('global_dst_detection').'";');
}


	eval('$auto_dst_detection = "'.$templates->get('global_dst_detection').'";');
}


Zeile 934Zeile 966
		'logout',
),
'captcha.php',

		'logout',
),
'captcha.php',

 
	'contact.php',

);

// If the board is closed, the user is not an administrator and they're not trying to login, show the board closed message

);

// If the board is closed, the user is not an administrator and they're not trying to login, show the board closed message

Zeile 976Zeile 1009
		'resetpassword',
),
'captcha.php',

		'resetpassword',
),
'captcha.php',

 
	'contact.php',

);

// If the board forces user to login/register, and the user is a guest, show the force login message

);

// If the board forces user to login/register, and the user is a guest, show the force login message