Vergleich global.php - 1.8.8 - 1.8.9

Zeile 449	Zeile 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"; $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 483	Zeile 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 498	Zeile 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').'";'); } // Otherwise, we have a guest	eval('$welcomeblock = "'.$templates->get('header_welcomeblock_member').'";'); } // Otherwise, we have a guest
Zeile 564	Zeile 583
if($user['canmanagerequests'] != 1) { continue;	if($user['canmanagerequests'] != 1) { continue;
}	}
$user['gid'] = (int)$user['gid']; $gids .= ",'{$user['gid']}'";	$user['gid'] = (int)$user['gid']; $gids .= ",'{$user['gid']}'";
Zeile 598	Zeile 617
{ // 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(!$is_super_admin) { // Include admin functions
Zeile 627	Zeile 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))	} if($can_access_moderationqueue \|\| ($mybb->user['ismoderator'] && $mybb->usergroup['canmodcp'] == 1 && $mybb->usergroup['canmanagereportedcontent'] == 1))
{ // Read the reported content cache $reported = $cache->read('reportedcontent');	{ // 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 641	Zeile 660
if($mybb->usergroup['cancp'] \|\| $mybb->usergroup['issupermod']) { $unread = (int)$reported['unread'];	if($mybb->usergroup['cancp'] \|\| $mybb->usergroup['issupermod']) { $unread = (int)$reported['unread'];
}	}
else { $unread = 0;	else { $unread = 0;
Zeile 661	Zeile 680
if($unread == 1) { $lang->unread_reports = $lang->unread_report;	if($unread == 1) { $lang->unread_reports = $lang->unread_report;
}	}
else { $lang->unread_reports = $lang->sprintf($lang->unread_reports, my_number_format($unread));	else { $lang->unread_reports = $lang->sprintf($lang->unread_reports, my_number_format($unread));
Zeile 693	Zeile 712
// Format their ban lift date and reason appropriately $banlift = $lang->banned_lifted_never; $reason = htmlspecialchars_uni($ban['reason']);	// Format their ban lift date and reason appropriately $banlift = $lang->banned_lifted_never; $reason = htmlspecialchars_uni($ban['reason']);

if($ban['lifted'] > 0) { $banlift = my_date($mybb->settings['dateformat'], $ban['lifted']) . $lang->comma . my_date($mybb->settings['timeformat'], $ban['lifted']);	if($ban['lifted'] > 0) { $banlift = my_date($mybb->settings['dateformat'], $ban['lifted']) . $lang->comma . my_date($mybb->settings['timeformat'], $ban['lifted']);
Zeile 703	Zeile 722
if(empty($reason)) { $reason = $lang->unknown;	if(empty($reason)) { $reason = $lang->unknown;
}	}
if(empty($banlift)) { $banlift = $lang->unknown;	if(empty($banlift)) { $banlift = $lang->unknown;
}	}
// 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').'";');
Zeile 724	Zeile 743
{ require_once MYBB_ROOT.'inc/class_parser.php'; $parser = new postParser;	{ require_once MYBB_ROOT.'inc/class_parser.php'; $parser = new postParser;
}	}
$query = $db->query(" SELECT pm.subject, pm.pmid, fu.username AS fromusername, fu.uid AS fromuid FROM ".TABLE_PREFIX."privatemessages pm	$query = $db->query(" SELECT pm.subject, pm.pmid, fu.username AS fromusername, fu.uid AS fromuid FROM ".TABLE_PREFIX."privatemessages pm
Zeile 737	Zeile 756
$pm = $db->fetch_array($query); $pm['subject'] = $parser->parse_badwords($pm['subject']);	$pm = $db->fetch_array($query); $pm['subject'] = $parser->parse_badwords($pm['subject']);

if($pm['fromuid'] == 0) { $pm['fromusername'] = $lang->mybb_engine;	if($pm['fromuid'] == 0) { $pm['fromusername'] = $lang->mybb_engine;
Zeile 758	Zeile 777
$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)