Vergleich portal.php - 1.8.14 - 1.8.30

  Keine Änderungen   Hinzugefügt   Modifiziert   Entfernt
Zeile 217Zeile 217
	eval("\$search = \"".$templates->get("portal_search")."\";");
}


	eval("\$search = \"".$templates->get("portal_search")."\";");
}


 
$onlinecount = null;

$whosonline = '';
// Get the online users
if($mybb->settings['portal_showwol'] != 0 && $mybb->usergroup['canviewonline'] != 0)

$whosonline = '';
// Get the online users
if($mybb->settings['portal_showwol'] != 0 && $mybb->usergroup['canviewonline'] != 0)

Zeile 233Zeile 234
	}

$timesearch = TIME_NOW - $mybb->settings['wolcutoff'];

	}

$timesearch = TIME_NOW - $mybb->settings['wolcutoff'];

	$comma = '';

 
	$guestcount = $membercount = $botcount = $anoncount = 0;

	$guestcount = $membercount = $botcount = $anoncount = 0;

	$onlinemembers = '';
$doneusers = array();




	$doneusers = $onlinemembers = $onlinebots = array();

$query = $db->simple_select("sessions", "COUNT(DISTINCT ip) AS guestcount", "uid = 0 AND time > $timesearch");
$guestcount = $db->fetch_field($query, "guestcount");


	$query = $db->query("

	$query = $db->query("

		SELECT s.sid, s.ip, s.uid, s.time, s.location, u.username, u.invisible, u.usergroup, u.displaygroup
FROM ".TABLE_PREFIX."sessions s
LEFT JOIN ".TABLE_PREFIX."users u ON (s.uid=u.uid)
WHERE s.time>'$timesearch'



		SELECT
s.sid, s.ip, s.uid, s.time, s.location, u.username, u.invisible, u.usergroup, u.displaygroup
FROM
".TABLE_PREFIX."sessions s
LEFT JOIN ".TABLE_PREFIX."users u ON (s.uid=u.uid)
WHERE (s.uid != 0 OR SUBSTR(s.sid,4,1) = '=') AND s.time > $timesearch

		ORDER BY {$order_by}, {$order_by2}
");

		ORDER BY {$order_by}, {$order_by2}
");

 

// Fetch spiders
$spiders = $cache->read('spiders');


	while($user = $db->fetch_array($query))
{

	while($user = $db->fetch_array($query))
{





		// Create a key to test if this user is a search bot.
$botkey = my_strtolower(str_replace("bot=", '', $user['sid']));


		// Create a key to test if this user is a search bot.
$botkey = my_strtolower(str_replace("bot=", '', $user['sid']));


		if($user['uid'] == "0")
{
++$guestcount;
}
elseif(my_strpos($user['sid'], "bot=") !== false && $session->bots[$botkey])
{
// The user is a search bot.
$onlinemembers .= $comma.format_name($session->bots[$botkey], $session->botgroup);
$comma = $lang->comma;
++$botcount;
}
else

		if($user['uid'] > 0)












		{
if(empty($doneusers[$user['uid']]) || $doneusers[$user['uid']] < $user['time'])
{
++$membercount;

$doneusers[$user['uid']] = $user['time'];

		{
if(empty($doneusers[$user['uid']]) || $doneusers[$user['uid']] < $user['time'])
{
++$membercount;

$doneusers[$user['uid']] = $user['time'];





				// If the user is logged in anonymously, update the count for that.
if($user['invisible'] == 1)
{
++$anoncount;

				// If the user is logged in anonymously, update the count for that.
if($user['invisible'] == 1)
{
++$anoncount;

				}

				}


if($user['invisible'] == 1)
{
$invisiblemark = "*";


if($user['invisible'] == 1)
{
$invisiblemark = "*";

				}

				}

				else
{
$invisiblemark = '';

				else
{
$invisiblemark = '';

				}


				}


				if(($user['invisible'] == 1 && ($mybb->usergroup['canviewwolinvis'] == 1 || $user['uid'] == $mybb->user['uid'])) || $user['invisible'] != 1)
{
$user['username'] = format_name(htmlspecialchars_uni($user['username']), $user['usergroup'], $user['displaygroup']);
$user['profilelink'] = get_profile_link($user['uid']);

				if(($user['invisible'] == 1 && ($mybb->usergroup['canviewwolinvis'] == 1 || $user['uid'] == $mybb->user['uid'])) || $user['invisible'] != 1)
{
$user['username'] = format_name(htmlspecialchars_uni($user['username']), $user['usergroup'], $user['displaygroup']);
$user['profilelink'] = get_profile_link($user['uid']);

					eval("\$onlinemembers .= \"".$templates->get("portal_whosonline_memberbit", 1, 0)."\";");
$comma = $lang->comma;

					eval("\$onlinemembers[] = \"".$templates->get("portal_whosonline_memberbit", 1, 0)."\";");


				}

				}

			}
}
}

$onlinecount = $membercount + $guestcount + $botcount;






































			}
}
elseif(my_strpos($user['sid'], 'bot=') !== false && $spiders[$botkey] && $mybb->settings['woldisplayspiders'] == 1)
{
// The user is a search bot.
if($mybb->settings['wolorder'] == 'username')
{
$key = $spiders[$botkey]['name'];
}
else
{
$key = $user['time'];
}

$onlinebots[$key] = format_name($spiders[$botkey]['name'], $spiders[$botkey]['usergroup']);
++$botcount;
}
}

if($mybb->settings['wolorder'] == 'activity')
{
// activity ordering is DESC, username is ASC
krsort($onlinebots);
}
else
{
ksort($onlinebots);
}

$onlinemembers = array_merge($onlinebots, $onlinemembers);
if(!empty($onlinemembers))
{
$comma = $lang->comma." ";
$onlinemembers = implode($comma, $onlinemembers);
}
else
{
$onlinemembers = "";
}

$onlinecount = $membercount + $guestcount + $botcount;


	// If we can see invisible users add them to the count
if($mybb->usergroup['canviewwolinvis'] == 1)
{

	// If we can see invisible users add them to the count
if($mybb->usergroup['canviewwolinvis'] == 1)
{

Zeile 311Zeile 344

// Most users online
$mostonline = $cache->read("mostonline");


// Most users online
$mostonline = $cache->read("mostonline");

	if($onlinecount > $mostonline['numusers'])

	if($onlinecount !== null && $onlinecount > $mostonline['numusers'])

	{
$time = TIME_NOW;
$mostonline['numusers'] = $onlinecount;

	{
$time = TIME_NOW;
$mostonline['numusers'] = $onlinecount;

Zeile 549Zeile 582
			if(!$announcement['uid'] && !$announcement['threadusername'])
{
$announcement['threadusername'] = htmlspecialchars_uni($lang->guest);

			if(!$announcement['uid'] && !$announcement['threadusername'])
{
$announcement['threadusername'] = htmlspecialchars_uni($lang->guest);

			}

			}

			else
{
$announcement['threadusername'] = htmlspecialchars_uni($announcement['threadusername']);
}

if($announcement['uid'] == 0)

			else
{
$announcement['threadusername'] = htmlspecialchars_uni($announcement['threadusername']);
}

if($announcement['uid'] == 0)

			{

			{

				$profilelink = $announcement['threadusername'];
}
else
{
$profilelink = build_profile_link($announcement['username'], $announcement['uid']);

				$profilelink = $announcement['threadusername'];
}
else
{
$profilelink = build_profile_link($announcement['username'], $announcement['uid']);

			}

			}


if(!$announcement['username'])
{


if(!$announcement['username'])
{

Zeile 580Zeile 613
			else
{
$icon = "&nbsp;";

			else
{
$icon = "&nbsp;";

			}


			}


			$useravatar = format_avatar($announcement['avatar'], $announcement['avatardimensions']);
eval("\$avatar = \"".$templates->get("portal_announcement_avatar")."\";");


			$useravatar = format_avatar($announcement['avatar'], $announcement['avatardimensions']);
eval("\$avatar = \"".$templates->get("portal_announcement_avatar")."\";");


Zeile 599Zeile 632

$senditem = '';
if($mybb->user['uid'] > 0 && $mybb->usergroup['cansendemail'] == 1)


$senditem = '';
if($mybb->user['uid'] > 0 && $mybb->usergroup['cansendemail'] == 1)

			{

			{

				eval("\$senditem = \"".$templates->get("portal_announcement_send_item")."\";");
}


				eval("\$senditem = \"".$templates->get("portal_announcement_send_item")."\";");
}


Zeile 616Zeile 649
			if($announcement['smilieoff'] == 1)
{
$parser_options['allow_smilies'] = 0;

			if($announcement['smilieoff'] == 1)
{
$parser_options['allow_smilies'] = 0;

			}

if($mybb->user['showimages'] != 1 && $mybb->user['uid'] != 0 || $mybb->settings['guestimages'] != 1 && $mybb->user['uid'] == 0)
{

			}

if($mybb->user['uid'] != 0 && $mybb->user['showimages'] != 1 || $mybb->settings['guestimages'] != 1 && $mybb->user['uid'] == 0)
{

				$parser_options['allow_imgcode'] = 0;
}


				$parser_options['allow_imgcode'] = 0;
}


			if($mybb->user['showvideos'] != 1 && $mybb->user['uid'] != 0 || $mybb->settings['guestvideos'] != 1 && $mybb->user['uid'] == 0)

			if($mybb->user['uid'] != 0 && $mybb->user['showvideos'] != 1 || $mybb->settings['guestvideos'] != 1 && $mybb->user['uid'] == 0)

			{
$parser_options['allow_videocode'] = 0;
}

			{
$parser_options['allow_videocode'] = 0;
}

Zeile 652Zeile 685
							$isimage = false;
}
$attachment['icon'] = get_attachment_icon($ext);

							$isimage = false;
}
$attachment['icon'] = get_attachment_icon($ext);

 
						if(!$attachment['dateuploaded'])
{
$attachment['dateuploaded'] = $announcement['dateline'];
}
$attachdate = my_date('normal', $attachment['dateuploaded']);

						// Support for [attachment=id] code
if(stripos($message, "[attachment=".$attachment['aid']."]") !== false)
{

						// Support for [attachment=id] code
if(stripos($message, "[attachment=".$attachment['aid']."]") !== false)
{