Vergleich misc.php - 1.8.14 - 1.8.25

  Keine Änderungen   Hinzugefügt   Modifiziert   Entfernt
Zeile 15Zeile 15
$templatelist = "misc_rules_forum,misc_help_helpdoc,misc_whoposted_poster,misc_whoposted,misc_smilies_popup_smilie,misc_smilies_popup,misc_smilies_popup_empty,misc_smilies_popup_row,multipage_start";
$templatelist .= ",misc_buddypopup,misc_buddypopup_user,misc_buddypopup_user_none,misc_buddypopup_user_online,misc_buddypopup_user_offline,misc_buddypopup_user_sendpm,misc_syndication_forumlist";
$templatelist .= ",misc_smilies,misc_smilies_smilie,misc_help_section_bit,misc_help_section,misc_help,forumdisplay_password_wrongpass,forumdisplay_password,misc_helpresults,misc_helpresults_bit";

$templatelist = "misc_rules_forum,misc_help_helpdoc,misc_whoposted_poster,misc_whoposted,misc_smilies_popup_smilie,misc_smilies_popup,misc_smilies_popup_empty,misc_smilies_popup_row,multipage_start";
$templatelist .= ",misc_buddypopup,misc_buddypopup_user,misc_buddypopup_user_none,misc_buddypopup_user_online,misc_buddypopup_user_offline,misc_buddypopup_user_sendpm,misc_syndication_forumlist";
$templatelist .= ",misc_smilies,misc_smilies_smilie,misc_help_section_bit,misc_help_section,misc_help,forumdisplay_password_wrongpass,forumdisplay_password,misc_helpresults,misc_helpresults_bit";

$templatelist .= ",multipage,multipage_end,multipage_jump_page,multipage_nextpage,multipage_page,multipage_page_current,multipage_page_link_current,multipage_prevpage,misc_imcenter_error";
$templatelist .= ",misc_smilies_popup_no_smilies,misc_smilies_no_smilies,misc_syndication,misc_help_search,misc_helpresults_noresults,misc_syndication_forumlist_forum,misc_syndication_feedurl,misc_whoposted_page";

$templatelist .= ",multipage,multipage_end,multipage_jump_page,multipage_nextpage,multipage_page,multipage_page_current,multipage_page_link_current,multipage_prevpage,misc_whoposted_page";
$templatelist .= ",misc_smilies_popup_no_smilies,misc_smilies_no_smilies,misc_syndication,misc_help_search,misc_helpresults_noresults,misc_syndication_forumlist_forum,misc_syndication_feedurl";


require_once "./global.php";
require_once MYBB_ROOT."inc/functions_post.php";


require_once "./global.php";
require_once MYBB_ROOT."inc/functions_post.php";

Zeile 268Zeile 268
	{
$mybb->settings['threadsperpage'] = 20;
}

	{
$mybb->settings['threadsperpage'] = 20;
}

 

$query = $db->simple_select("helpdocs", "COUNT(*) AS total", "hid IN(".$db->escape_string($search['querycache']).")");
$helpcount = $db->fetch_field($query, "total");


// Work out pagination, which page we're at, as well as the limits.
$perpage = $mybb->settings['threadsperpage'];


// Work out pagination, which page we're at, as well as the limits.
$perpage = $mybb->settings['threadsperpage'];

Zeile 275Zeile 278
	if($page > 0)
{
$start = ($page-1) * $perpage;

	if($page > 0)
{
$start = ($page-1) * $perpage;

	}







		$pages = ceil($helpcount / $perpage);
if($pages > $page)
{
$start = 0;
$page = 1;
}
}

	else
{
$start = 0;

	else
{
$start = 0;

Zeile 293Zeile 302
	}

// Do Multi Pages

	}

// Do Multi Pages

	$query = $db->simple_select("helpdocs", "COUNT(*) AS total", "hid IN(".$db->escape_string($search['querycache']).")");
$helpcount = $db->fetch_array($query);


 
	if($upper > $helpcount)
{
$upper = $helpcount;
}

	if($upper > $helpcount)
{
$upper = $helpcount;
}

	$multipage = multipage($helpcount['total'], $perpage, $page, "misc.php?action=helpresults&sid='".htmlspecialchars_uni($mybb->get_input('sid'))."'");

	$multipage = multipage($helpcount, $perpage, $page, "misc.php?action=helpresults&sid='".htmlspecialchars_uni($mybb->get_input('sid'))."'");

	$helpdoclist = '';

require_once MYBB_ROOT."inc/class_parser.php";

	$helpdoclist = '';

require_once MYBB_ROOT."inc/class_parser.php";

Zeile 333Zeile 339
			'allow_imgcode' => 0,
'filter_badwords' => 1
);

			'allow_imgcode' => 0,
'filter_badwords' => 1
);

		$helpdoc['helpdoc'] = my_strip_tags($parser->parse_message($helpdoc['document'], $parser_options));

		$helpdoc['helpdoc'] = $parser->parse_message($helpdoc['document'], $parser_options);


if(my_strlen($helpdoc['helpdoc']) > 350)
{


if(my_strlen($helpdoc['helpdoc']) > 350)
{

Zeile 490Zeile 496
						$expcolimage = "collapse_collapsed.png";
$expdisplay = "display: none;";
$expthead = " thead_collapsed";

						$expcolimage = "collapse_collapsed.png";
$expdisplay = "display: none;";
$expthead = " thead_collapsed";

 
						$expaltext = "[+]";

					}
else
{
$expcolimage = "collapse.png";
$expthead = "";

					}
else
{
$expcolimage = "collapse.png";
$expthead = "";

 
						$expaltext = "[-]";

					}
}
eval("\$sections .= \"".$templates->get("misc_help_section")."\";");

					}
}
eval("\$sections .= \"".$templates->get("misc_help_section")."\";");

Zeile 707Zeile 715
				$onclick = "opener.location.href='".get_profile_link($poster['uid'])."'; return false;";
}
$profile_link = build_profile_link($poster_name, $poster['uid'], '_blank', $onclick);

				$onclick = "opener.location.href='".get_profile_link($poster['uid'])."'; return false;";
}
$profile_link = build_profile_link($poster_name, $poster['uid'], '_blank', $onclick);

		}

		}

		else
{
$profile_link = build_profile_link($poster_name, $poster['uid']);

		else
{
$profile_link = build_profile_link($poster_name, $poster['uid']);

Zeile 728Zeile 736
	{
require_once MYBB_ROOT."inc/class_parser.php";
$parser = new postParser;

	{
require_once MYBB_ROOT."inc/class_parser.php";
$parser = new postParser;





		// Get thread prefix
$breadcrumbprefix = '';
$threadprefix = array('prefix' => '');

		// Get thread prefix
$breadcrumbprefix = '';
$threadprefix = array('prefix' => '');

Zeile 738Zeile 746
			if(!empty($threadprefix['displaystyle']))
{
$breadcrumbprefix = $threadprefix['displaystyle'].' ';

			if(!empty($threadprefix['displaystyle']))
{
$breadcrumbprefix = $threadprefix['displaystyle'].' ';

			}

			}

		}

$thread['subject'] = htmlspecialchars_uni($parser->parse_badwords($thread['subject']));

		}

$thread['subject'] = htmlspecialchars_uni($parser->parse_badwords($thread['subject']));

Zeile 792Zeile 800
				else
{
$e = 2;

				else
{
$e = 2;

				}
}
}

				}
}
}


if($e == 2)


if($e == 2)

		{

		{

			eval("\$smilies .= \"".$templates->get("misc_smilies_popup_empty")."\";");
}

if(!$smilies)
{
eval("\$smilies = \"".$templates->get("misc_smilies_popup_no_smilies")."\";");

			eval("\$smilies .= \"".$templates->get("misc_smilies_popup_empty")."\";");
}

if(!$smilies)
{
eval("\$smilies = \"".$templates->get("misc_smilies_popup_no_smilies")."\";");

		}


		}


		eval("\$smiliespage = \"".$templates->get("misc_smilies_popup", 1, 0)."\";");
output_page($smiliespage);
}

		eval("\$smiliespage = \"".$templates->get("misc_smilies_popup", 1, 0)."\";");
output_page($smiliespage);
}

Zeile 816Zeile 824
		$smilies_cache = $cache->read("smilies");

if(is_array($smilies_cache))

		$smilies_cache = $cache->read("smilies");

if(is_array($smilies_cache))

		{

		{

			$extra_class = $onclick = '';
foreach($smilies_cache as $smilie)
{

			$extra_class = $onclick = '';
foreach($smilies_cache as $smilie)
{

Zeile 838Zeile 846

eval("\$smiliespage = \"".$templates->get("misc_smilies")."\";");
output_page($smiliespage);


eval("\$smiliespage = \"".$templates->get("misc_smilies")."\";");
output_page($smiliespage);

	}
}
elseif($mybb->input['action'] == "imcenter")
{
$mybb->input['imtype'] = $mybb->get_input('imtype');
if($mybb->input['imtype'] != "aim" && $mybb->input['imtype'] != "skype" && $mybb->input['imtype'] != "yahoo")
{
$message = $lang->error_invalidimtype;
eval("\$error = \"".$templates->get("misc_imcenter_error", 1, 0)."\";");
echo $error;
exit;
}

$uid = $mybb->get_input('uid', MyBB::INPUT_INT);
$user = get_user($uid);

if(!$user)
{
$message = $lang->error_invaliduser;
eval("\$error = \"".$templates->get("misc_imcenter_error", 1, 0)."\";");
echo $error;
exit;
}

if(empty($user[$mybb->input['imtype']]))
{
$message = $lang->error_invalidimtype;
eval("\$error = \"".$templates->get("misc_imcenter_error", 1, 0)."\";");
echo $error;
exit;
}

$settingkey = 'allow'.$mybb->input['imtype'].'field';
if(!is_member($mybb->settings[$settingkey], $user))
{
$message = $lang->error_nopermission_user_ajax;
eval("\$error = \"".$templates->get("misc_imcenter_error", 1, 0)."\";");
echo $error;
exit;
}

// Build IM navigation bar
$navigationbar = $navsep = $imtype = $imtype_lang = '';
if(!empty($user['aim']) && is_member($mybb->settings['allowaimfield'], array('usergroup' => $user['usergroup'], 'additionalgroups' => $user['additionalgroups'])))
{
$imtype = "aim";
$imtype_lang = $lang->aol_im;
eval("\$navigationbar .= \"".$templates->get("misc_imcenter_nav")."\";");
$navsep = ' - ';
}
if(!empty($user['skype']) && is_member($mybb->settings['allowskypefield'], array('usergroup' => $user['usergroup'], 'additionalgroups' => $user['additionalgroups'])))
{
$imtype = "skype";
$imtype_lang = $lang->skype;
eval("\$navigationbar .= \"".$templates->get("misc_imcenter_nav")."\";");
$navsep = ' - ';
}
if(!empty($user['yahoo']) && is_member($mybb->settings['allowyahoofield'], array('usergroup' => $user['usergroup'], 'additionalgroups' => $user['additionalgroups'])))
{
$imtype = "yahoo";
$imtype_lang = $lang->yahoo_im;
eval("\$navigationbar .= \"".$templates->get("misc_imcenter_nav")."\";");
}

$user['skype'] = htmlspecialchars_uni($user['skype']);
$user['yahoo'] = htmlspecialchars_uni($user['yahoo']);
$user['aim'] = htmlspecialchars_uni($user['aim']);

$user['username'] = htmlspecialchars_uni($user['username']);

$lang->chat_on_skype = $lang->sprintf($lang->chat_on_skype, $user['username']);
$lang->call_on_skype = $lang->sprintf($lang->call_on_skype, $user['username']);

	}
}











































































	$imtemplate = "misc_imcenter_".$mybb->input['imtype'];
eval("\$imcenter = \"".$templates->get($imtemplate, 1, 0)."\";");
echo $imcenter;
exit;
}

 
elseif($mybb->input['action'] == "syndication")
{
$plugins->run_hooks("misc_syndication_start");

$fid = $mybb->get_input('fid', MyBB::INPUT_INT);
$version = $mybb->get_input('version');

elseif($mybb->input['action'] == "syndication")
{
$plugins->run_hooks("misc_syndication_start");

$fid = $mybb->get_input('fid', MyBB::INPUT_INT);
$version = $mybb->get_input('version');

	$new_limit = $mybb->get_input('limit', MyBB::INPUT_INT);

 
	$forums = $mybb->get_input('forums', MyBB::INPUT_ARRAY);

	$forums = $mybb->get_input('forums', MyBB::INPUT_ARRAY);

	$limit = 15;
if(!empty($new_limit) && $new_limit != $limit)
{
$limit = $new_limit;
}
$feedurl = '';
$add = false;

	$limit = $mybb->get_input('limit', MyBB::INPUT_INT);
$url = $mybb->settings['bburl']."/syndication.php";
$syndicate = $urlquery = array();






add_breadcrumb($lang->nav_syndication);
$unviewable = get_unviewable_forums();
$inactiveforums = get_inactive_forums();


add_breadcrumb($lang->nav_syndication);
$unviewable = get_unviewable_forums();
$inactiveforums = get_inactive_forums();

	$unexp1 = explode(',', $unviewable);
$unexp2 = explode(',', $inactiveforums);
$unexp = array_merge($unexp1, $unexp2);

	$unexp = explode(',', $unviewable . ',' . $inactiveforums);







	if(is_array($forums))

	if(is_array($forums) && !in_array('all', $forums))

	{

	{

		foreach($unexp as $fid)
{
$unview[$fid] = true;
}

$syndicate = '';
$comma = '';
$all = false;

 
		foreach($forums as $fid)
{

		foreach($forums as $fid)
{

			if($fid == "all")
{
$all = true;
break;
}
elseif(ctype_digit($fid))
{
if(!isset($unview[$fid]))
{
$syndicate .= $comma.$fid;
$comma = ",";
$flist[$fid] = true;
}
}
}
$url = $mybb->settings['bburl']."/syndication.php";
if(!$all)
{
$url .= "?fid=$syndicate";
$add = true;
}

// If the version is not RSS2.0, set the type to Atom1.0.
if($version != "rss2.0")
{
if(!$add)
{
$url .= "?";
}
else
{
$url .= "&";
}
$url .= "type=atom1.0";
$add = true;
}
if((int)$limit > 0)
{
if($limit > 50)

			if(ctype_digit($fid) && !in_array($fid, $unexp))







































			{

			{

				$limit = 50;
}
if(!$add)
{
$url .= "?";
}
else
{
$url .= "&";
}
if(is_numeric($limit))
{
$url .= "limit=$limit";

				$syndicate[] = $fid;
$flist[$fid] = true;












			}
}

			}
}

		eval("\$feedurl = \"".$templates->get("misc_syndication_feedurl")."\";");
}
unset($GLOBALS['forumcache']);





if(!empty($syndicate))
{
$urlquery[] = "fid=". implode(",", $syndicate);
}
}


// If there is no version in the input, check the default (RSS2.0).


// If there is no version in the input, check the default (RSS2.0).

	if($version == "atom1.0")







	$json1check = $atom1check = $rss2check = "";
if($version == "json")
{
$json1check = "checked=\"checked\"";
$urlquery[] = "type=".$version;
}
elseif($version == "atom1.0")

	{
$atom1check = "checked=\"checked\"";

	{
$atom1check = "checked=\"checked\"";

		$rss2check = '';

		$urlquery[] = "type=".$version;

	}
else
{

	}
else
{

		$atom1check = '';

 
		$rss2check = "checked=\"checked\"";

		$rss2check = "checked=\"checked\"";

	}
$forumselect = makesyndicateforums();

$plugins->run_hooks("misc_syndication_end");














	}
// Evaluate, reset and set limit (Drive through settings?)
$limit = empty($limit) ? 15 : (($limit > 50) ? 50 : $limit);
$urlquery[] = "limit=" . $limit;

// Generate feed url
if(!empty($urlquery)){
$url .= "?" . implode('&', $urlquery);
}
eval("\$feedurl = \"".$templates->get("misc_syndication_feedurl")."\";");

unset($GLOBALS['forumcache']);

$forumselect = makesyndicateforums();

$plugins->run_hooks("misc_syndication_end");


	eval("\$syndication = \"".$templates->get("misc_syndication")."\";");
output_page($syndication);
}

	eval("\$syndication = \"".$templates->get("misc_syndication")."\";");
output_page($syndication);
}

Zeile 1067Zeile 956
		while($forum = $db->fetch_array($query))
{
$forumcache[$forum['pid']][$forum['disporder']][$forum['fid']] = $forum;

		while($forum = $db->fetch_array($query))
{
$forumcache[$forum['pid']][$forum['disporder']][$forum['fid']] = $forum;

		}
}

		}
}


if(!is_array($permissioncache))
{


if(!is_array($permissioncache))
{

Zeile 1088Zeile 977
					if(isset($flist[$forum['fid']]))
{
$optionselected = 'selected="selected"';

					if(isset($flist[$forum['fid']]))
{
$optionselected = 'selected="selected"';

						$selecteddone = "1";
}

if($forum['password'] == '' && !in_array($forum['fid'], $unexp) || $forum['password'] && isset($mybb->cookies['forumpass'][$forum['fid']]) && $mybb->cookies['forumpass'][$forum['fid']] === md5($mybb->user['uid'].$forum['password']))
{
eval("\$forumlistbits .= \"".$templates->get("misc_syndication_forumlist_forum")."\";");

					}

if($forum['password'] == '' && !in_array($forum['fid'], $unexp) || $forum['password'] && isset($mybb->cookies['forumpass'][$forum['fid']]) && my_hash_equals($mybb->cookies['forumpass'][$forum['fid']], md5($mybb->user['uid'].$forum['password'])))
{
eval("\$forumlistbits .= \"".$templates->get("misc_syndication_forumlist_forum")."\";");


					}

if(!empty($forumcache[$forum['fid']]))
{
$newdepth = $depth."    ";
$forumlistbits .= makesyndicateforums($forum['fid'], '', 0, $newdepth);

					}

if(!empty($forumcache[$forum['fid']]))
{
$newdepth = $depth."    ";
$forumlistbits .= makesyndicateforums($forum['fid'], '', 0, $newdepth);

 
					}
}
else
{
if(isset($flist[$forum['fid']]))
{
unset($flist[$forum['fid']]);

					}
}
}

					}
}
}

Zeile 1108Zeile 1003

if($addselect)
{


if($addselect)
{

		$addsel = '';
if(empty($selecteddone))
{
$addsel = ' selected="selected"';
}


		$addsel = empty($flist) ? ' selected="selected"' : '';






		eval("\$forumlist = \"".$templates->get("misc_syndication_forumlist")."\";");
}


		eval("\$forumlist = \"".$templates->get("misc_syndication_forumlist")."\";");
}