Vergleich misc.php - 1.8.18 - 1.8.21

  Keine Änderungen   Hinzugefügt   Modifiziert   Entfernt
Zeile 776Zeile 776
			$extra_class = ' smilie_pointer';
foreach($smilies_cache as $smilie)
{

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

				if($smilie['showclickable'] != 1)
{
continue;
}

 
				$smilie['image'] = str_replace("{theme}", $theme['imgdir'], $smilie['image']);
$smilie['image'] = htmlspecialchars_uni($mybb->get_asset_url($smilie['image']));
$smilie['name'] = htmlspecialchars_uni($smilie['name']);

				$smilie['image'] = str_replace("{theme}", $theme['imgdir'], $smilie['image']);
$smilie['image'] = htmlspecialchars_uni($mybb->get_asset_url($smilie['image']));
$smilie['name'] = htmlspecialchars_uni($smilie['name']);

Zeile 790Zeile 786

$smilie['find'] = htmlspecialchars_uni($smilie['find']);
$smilie_insert = str_replace(array('\\', "'"), array('\\\\', "\'"), $smilie['find']);


$smilie['find'] = htmlspecialchars_uni($smilie['find']);
$smilie_insert = str_replace(array('\\', "'"), array('\\\\', "\'"), $smilie['find']);





				$onclick = " onclick=\"MyBBEditor.insertText(' $smilie_insert ');\"";
eval('$smilie_image = "'.$templates->get('smilie', 1, 0).'";');
eval("\$smile_icons .= \"".$templates->get("misc_smilies_popup_smilie")."\";");

				$onclick = " onclick=\"MyBBEditor.insertText(' $smilie_insert ');\"";
eval('$smilie_image = "'.$templates->get('smilie', 1, 0).'";');
eval("\$smile_icons .= \"".$templates->get("misc_smilies_popup_smilie")."\";");

Zeile 806Zeile 802
					$e = 2;
}
}

					$e = 2;
}
}

		}


		}


		if($e == 2)
{
eval("\$smilies .= \"".$templates->get("misc_smilies_popup_empty")."\";");

		if($e == 2)
{
eval("\$smilies .= \"".$templates->get("misc_smilies_popup_empty")."\";");

		}

if(!$smilies)

		}

if(!$smilies)

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

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

Zeile 826Zeile 822
		add_breadcrumb($lang->nav_smilies);
$class = "trow1";
$smilies_cache = $cache->read("smilies");

		add_breadcrumb($lang->nav_smilies);
$class = "trow1";
$smilies_cache = $cache->read("smilies");





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

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

				if($smilie['showclickable'] != 1)
{
continue;
}

 
				$smilie['image'] = str_replace("{theme}", $theme['imgdir'], $smilie['image']);
$smilie['image'] = htmlspecialchars_uni($mybb->get_asset_url($smilie['image']));
$smilie['name'] = htmlspecialchars_uni($smilie['name']);

				$smilie['image'] = str_replace("{theme}", $theme['imgdir'], $smilie['image']);
$smilie['image'] = htmlspecialchars_uni($mybb->get_asset_url($smilie['image']));
$smilie['name'] = htmlspecialchars_uni($smilie['name']);





				$smilie['find'] = nl2br(htmlspecialchars_uni($smilie['find']));
eval('$smilie_image = "'.$templates->get('smilie').'";');
eval("\$smilies .= \"".$templates->get("misc_smilies_smilie")."\";");

				$smilie['find'] = nl2br(htmlspecialchars_uni($smilie['find']));
eval('$smilie_image = "'.$templates->get('smilie').'";');
eval("\$smilies .= \"".$templates->get("misc_smilies_smilie")."\";");

Zeile 850Zeile 842
		if(!$smilies)
{
eval("\$smilies = \"".$templates->get("misc_smilies_no_smilies")."\";");

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

		}


		}


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

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

Zeile 860Zeile 852
{
$mybb->input['imtype'] = $mybb->get_input('imtype');
if($mybb->input['imtype'] != "skype" && $mybb->input['imtype'] != "yahoo")

{
$mybb->input['imtype'] = $mybb->get_input('imtype');
if($mybb->input['imtype'] != "skype" && $mybb->input['imtype'] != "yahoo")

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

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


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


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

	$user = get_user($uid);


	$user = get_user($uid);


	if(!$user)

	if(!$user)

	{

	{

		$message = $lang->error_invaliduser;

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

if(empty($user[$mybb->input['imtype']]))
{
$message = $lang->error_invalidimtype;

		eval("\$error = \"".$templates->get("misc_imcenter_error", 1, 0)."\";");
echo $error;
exit;

		eval("\$error = \"".$templates->get("misc_imcenter_error", 1, 0)."\";");
echo $error;
exit;

Zeile 893Zeile 885
		eval("\$error = \"".$templates->get("misc_imcenter_error", 1, 0)."\";");
echo $error;
exit;

		eval("\$error = \"".$templates->get("misc_imcenter_error", 1, 0)."\";");
echo $error;
exit;

	}


	}


	// Build IM navigation bar
$navigationbar = $navsep = $imtype = $imtype_lang = '';
if(!empty($user['skype']) && is_member($mybb->settings['allowskypefield'], array('usergroup' => $user['usergroup'], 'additionalgroups' => $user['additionalgroups'])))

	// Build IM navigation bar
$navigationbar = $navsep = $imtype = $imtype_lang = '';
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")."\";");

		$imtype = "skype";
$imtype_lang = $lang->skype;
eval("\$navigationbar .= \"".$templates->get("misc_imcenter_nav")."\";");

Zeile 910Zeile 902
		$imtype_lang = $lang->yahoo_im;
eval("\$navigationbar .= \"".$templates->get("misc_imcenter_nav")."\";");
}

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


Zeile 918Zeile 910

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





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

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

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

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





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

	$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)
{
$limit = 50;
}
if(!$add)
{
$url .= "?";
}
else
{
$url .= "&";
}
if(is_numeric($limit))

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



















































			{

			{

				$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")
{
$atom1check = "checked=\"checked\"";
$rss2check = '';
}







	$json1check = $atom1check = $rss2check = "";
if($version == "json")
{
$json1check = "checked=\"checked\"";
$urlquery[] = "type=".$version;
}
elseif($version == "atom1.0")
{
$atom1check = "checked=\"checked\"";
$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();

$plugins->run_hooks("misc_syndication_end");

	$forumselect = makesyndicateforums();

$plugins->run_hooks("misc_syndication_end");

Zeile 1096Zeile 1044
					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']]) && my_hash_equals($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'])))

Zeile 1108Zeile 1055
					{
$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 1116Zeile 1070

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