Vergleich misc.php - 1.8.15 - 1.8.22

  Keine Änderungen   Hinzugefügt   Modifiziert   Entfernt
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 648Zeile 656
		else
{
$show_posts = "p.visible IN (-1,0,1)";

		else
{
$show_posts = "p.visible IN (-1,0,1)";

		}

		}

	}
else
{

	}
else
{

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

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;
}


	if($mybb->input['imtype'] != "skype")
{
$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);


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


Zeile 880Zeile 889
	}

// Build IM navigation bar

	}

// 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 = ' - ';
}

	$navigationbar = $imtype = $imtype_lang = '';








	if(!empty($user['skype']) && is_member($mybb->settings['allowskypefield'], array('usergroup' => $user['usergroup'], 'additionalgroups' => $user['additionalgroups'])))

	if(!empty($user['skype']) && is_member($mybb->settings['allowskypefield'], array('usergroup' => $user['usergroup'], 'additionalgroups' => $user['additionalgroups'])))

	{

	{

		$imtype = "skype";
$imtype_lang = $lang->skype;

		$imtype = "skype";
$imtype_lang = $lang->skype;

		eval("\$navigationbar .= \"".$templates->get("misc_imcenter_nav")."\";");
$navsep = ' - ';

		eval("\$navigationbar .= \"".$templates->get("misc_imcenter_nav")."\";");


	}

	}

	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['skype'] = htmlspecialchars_uni($user['skype']);

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


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

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


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


Zeile 916Zeile 908
	echo $imcenter;
exit;
}

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

if(is_array($forums))

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

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")."\";");






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

	}

	}

	unset($GLOBALS['forumcache']);

 

// 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\"";

	}













	}
// 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();

	$forumselect = makesyndicateforums();





	$plugins->run_hooks("misc_syndication_end");

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

	$plugins->run_hooks("misc_syndication_end");

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

Zeile 1031Zeile 980
elseif($mybb->input['action'] == "clearcookies")
{
verify_post_check($mybb->get_input('my_post_key'));

elseif($mybb->input['action'] == "clearcookies")
{
verify_post_check($mybb->get_input('my_post_key'));





	$plugins->run_hooks("misc_clearcookies");

$remove_cookies = array('mybbuser', 'mybb[announcements]', 'mybb[lastvisit]', 'mybb[lastactive]', 'collapsed', 'mybb[forumread]', 'mybb[threadsread]', 'mybbadmin',

	$plugins->run_hooks("misc_clearcookies");

$remove_cookies = array('mybbuser', 'mybb[announcements]', 'mybb[lastvisit]', 'mybb[lastactive]', 'collapsed', 'mybb[forumread]', 'mybb[threadsread]', 'mybbadmin',

Zeile 1085Zeile 1034
				if($perms['canview'] == 1 || $mybb->settings['hideprivateforums'] == 0)
{
$optionselected = '';

				if($perms['canview'] == 1 || $mybb->settings['hideprivateforums'] == 0)
{
$optionselected = '';

					if(isset($flist[$forum['fid']]))
{

					if(isset($flist[$forum['fid']]))
{

						$optionselected = 'selected="selected"';

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

					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")."\";");
}

					{
eval("\$forumlistbits .= \"".$templates->get("misc_syndication_forumlist_forum")."\";");
}

Zeile 1100Zeile 1048
					{
$newdepth = $depth."    ";
$forumlistbits .= makesyndicateforums($forum['fid'], '', 0, $newdepth);

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

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

					}
}
}

					}
}
}

Zeile 1108Zeile 1063

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")."\";");
}