phpBB

Code Changes

File: viewtopic.php

  Unmodified   Added   Modified   Removed
Line 32Line 32
$post_id	= $request->variable('p', 0);
$voted_id = $request->variable('vote_id', array('' => 0));


$post_id	= $request->variable('p', 0);
$voted_id = $request->variable('vote_id', array('' => 0));


$voted_id = (sizeof($voted_id) > 1) ? array_unique($voted_id) : $voted_id;

$voted_id = (count($voted_id) > 1) ? array_unique($voted_id) : $voted_id;



$start = $request->variable('start', 0);



$start = $request->variable('start', 0);

Line 262Line 262
}

$forum_id = (int) $topic_data['forum_id'];

}

$forum_id = (int) $topic_data['forum_id'];

 

// If the request is missing the f parameter, the forum id in the user session data is 0 at the moment.
// Let's fix that now so that the user can't hide from the forum's Who Is Online list.
$user->page['forum'] = $forum_id;


// Now we know the forum_id and can check the permissions


// Now we know the forum_id and can check the permissions

if ($topic_data['topic_visibility'] != ITEM_APPROVED && !$auth->acl_get('m_approve', $forum_id))

if (!$phpbb_content_visibility->is_visible('topic', $forum_id, $topic_data))

{
trigger_error('NO_TOPIC');
}

{
trigger_error('NO_TOPIC');
}

Line 736Line 740

'TOTAL_POSTS' => $user->lang('VIEW_TOPIC_POSTS', (int) $total_posts),
'U_MCP' => ($auth->acl_get('m_', $forum_id)) ? append_sid("{$phpbb_root_path}mcp.$phpEx", "i=main&mode=topic_view&f=$forum_id&t=$topic_id" . (($start == 0) ? '' : "&start=$start") . ((strlen($u_sort_param)) ? "&$u_sort_param" : ''), true, $user->session_id) : '',


'TOTAL_POSTS' => $user->lang('VIEW_TOPIC_POSTS', (int) $total_posts),
'U_MCP' => ($auth->acl_get('m_', $forum_id)) ? append_sid("{$phpbb_root_path}mcp.$phpEx", "i=main&mode=topic_view&f=$forum_id&t=$topic_id" . (($start == 0) ? '' : "&start=$start") . ((strlen($u_sort_param)) ? "&$u_sort_param" : ''), true, $user->session_id) : '',

	'MODERATORS'	=> (isset($forum_moderators[$forum_id]) && sizeof($forum_moderators[$forum_id])) ? implode($user->lang['COMMA_SEPARATOR'], $forum_moderators[$forum_id]) : '',

	'MODERATORS'	=> (isset($forum_moderators[$forum_id]) && count($forum_moderators[$forum_id])) ? implode($user->lang['COMMA_SEPARATOR'], $forum_moderators[$forum_id]) : '',


'POST_IMG' => ($topic_data['forum_status'] == ITEM_LOCKED) ? $user->img('button_topic_locked', 'FORUM_LOCKED') : $user->img('button_topic_new', 'POST_NEW_TOPIC'),
'QUOTE_IMG' => $user->img('icon_post_quote', 'REPLY_WITH_QUOTE'),


'POST_IMG' => ($topic_data['forum_status'] == ITEM_LOCKED) ? $user->img('button_topic_locked', 'FORUM_LOCKED') : $user->img('button_topic_new', 'POST_NEW_TOPIC'),
'QUOTE_IMG' => $user->img('icon_post_quote', 'REPLY_WITH_QUOTE'),

Line 759Line 763
	'S_SELECT_SORT_DIR' 	=> $s_sort_dir,
'S_SELECT_SORT_KEY' => $s_sort_key,
'S_SELECT_SORT_DAYS' => $s_limit_days,

	'S_SELECT_SORT_DIR' 	=> $s_sort_dir,
'S_SELECT_SORT_KEY' => $s_sort_key,
'S_SELECT_SORT_DAYS' => $s_limit_days,

	'S_SINGLE_MODERATOR'	=> (!empty($forum_moderators[$forum_id]) && sizeof($forum_moderators[$forum_id]) > 1) ? false : true,

	'S_SINGLE_MODERATOR'	=> (!empty($forum_moderators[$forum_id]) && count($forum_moderators[$forum_id]) > 1) ? false : true,

	'S_TOPIC_ACTION' 		=> append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$forum_id&t=$topic_id" . (($start == 0) ? '' : "&start=$start")),
'S_MOD_ACTION' => $s_quickmod_action,


	'S_TOPIC_ACTION' 		=> append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$forum_id&t=$topic_id" . (($start == 0) ? '' : "&start=$start")),
'S_MOD_ACTION' => $s_quickmod_action,


Line 852Line 856
		(($topic_data['poll_length'] != 0 && $topic_data['poll_start'] + $topic_data['poll_length'] > time()) || $topic_data['poll_length'] == 0) &&
$topic_data['topic_status'] != ITEM_LOCKED &&
$topic_data['forum_status'] != ITEM_LOCKED &&

		(($topic_data['poll_length'] != 0 && $topic_data['poll_start'] + $topic_data['poll_length'] > time()) || $topic_data['poll_length'] == 0) &&
$topic_data['topic_status'] != ITEM_LOCKED &&
$topic_data['forum_status'] != ITEM_LOCKED &&

		(!sizeof($cur_voted_id) ||

		(!count($cur_voted_id) ||

		($auth->acl_get('f_votechg', $forum_id) && $topic_data['poll_vote_change']))) ? true : false;

		($auth->acl_get('f_votechg', $forum_id) && $topic_data['poll_vote_change']))) ? true : false;

	$s_display_results = (!$s_can_vote || ($s_can_vote && sizeof($cur_voted_id)) || $view == 'viewpoll') ? true : false;

	$s_display_results = (!$s_can_vote || ($s_can_vote && count($cur_voted_id)) || $view == 'viewpoll') ? true : false;


/**
* Event to manipulate the poll data


/**
* Event to manipulate the poll data

Line 889Line 893
	if ($update && $s_can_vote)
{


	if ($update && $s_can_vote)
{


		if (!sizeof($voted_id) || sizeof($voted_id) > $topic_data['poll_max_options'] || in_array(VOTE_CONVERTED, $cur_voted_id) || !check_form_key('posting'))

		if (!count($voted_id) || count($voted_id) > $topic_data['poll_max_options'] || in_array(VOTE_CONVERTED, $cur_voted_id) || !check_form_key('posting'))

		{
$redirect_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$forum_id&t=$topic_id" . (($start == 0) ? '' : "&start=$start"));

meta_refresh(5, $redirect_url);

		{
$redirect_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$forum_id&t=$topic_id" . (($start == 0) ? '' : "&start=$start"));

meta_refresh(5, $redirect_url);

			if (!sizeof($voted_id))

			if (!count($voted_id))

			{
$message = 'NO_VOTE_OPTION';
}

			{
$message = 'NO_VOTE_OPTION';
}

			else if (sizeof($voted_id) > $topic_data['poll_max_options'])

			else if (count($voted_id) > $topic_data['poll_max_options'])

			{
$message = 'TOO_MANY_VOTE_OPTIONS';
}

			{
$message = 'TOO_MANY_VOTE_OPTIONS';
}

Line 992Line 996
				'user_votes'		=> array_flip($valid_user_votes),
'vote_counts' => $vote_counts,
'total_votes' => array_sum($vote_counts),

				'user_votes'		=> array_flip($valid_user_votes),
'vote_counts' => $vote_counts,
'total_votes' => array_sum($vote_counts),

				'can_vote'			=> !sizeof($valid_user_votes) || ($auth->acl_get('f_votechg', $forum_id) && $topic_data['poll_vote_change']),

				'can_vote'			=> !count($valid_user_votes) || ($auth->acl_get('f_votechg', $forum_id) && $topic_data['poll_vote_change']),

			);
$json_response = new \phpbb\json_response();
$json_response->send($data);

			);
$json_response = new \phpbb\json_response();
$json_response->send($data);

Line 1012Line 1016

$parse_flags = ($poll_info[0]['bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0) | OPTION_FLAG_SMILIES;



$parse_flags = ($poll_info[0]['bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0) | OPTION_FLAG_SMILIES;


	for ($i = 0, $size = sizeof($poll_info); $i < $size; $i++)

	for ($i = 0, $size = count($poll_info); $i < $size; $i++)

	{
$poll_info[$i]['poll_option_text'] = generate_text_for_display($poll_info[$i]['poll_option_text'], $poll_info[$i]['bbcode_uid'], $poll_option['bbcode_bitfield'], $parse_flags, true);
}

	{
$poll_info[$i]['poll_option_text'] = generate_text_for_display($poll_info[$i]['poll_option_text'], $poll_info[$i]['bbcode_uid'], $poll_option['bbcode_bitfield'], $parse_flags, true);
}

Line 1154Line 1158
}
$db->sql_freeresult($result);


}
$db->sql_freeresult($result);


if (!sizeof($post_list))

if (!count($post_list))

{
if ($sort_days)
{

{
if ($sort_days)
{

Line 1478Line 1482
}

// Generate online information for user

}

// Generate online information for user

if ($config['load_onlinetrack'] && sizeof($id_cache))

if ($config['load_onlinetrack'] && count($id_cache))

{
$sql = 'SELECT session_user_id, MAX(session_time) as online_time, MIN(session_viewonline) AS viewonline
FROM ' . SESSIONS_TABLE . '

{
$sql = 'SELECT session_user_id, MAX(session_time) as online_time, MIN(session_viewonline) AS viewonline
FROM ' . SESSIONS_TABLE . '

Line 1496Line 1500
unset($id_cache);

// Pull attachment data

unset($id_cache);

// Pull attachment data

if (sizeof($attach_list))

if (count($attach_list))

{
if ($auth->acl_get('u_download') && $auth->acl_get('f_download', $forum_id))
{

{
if ($auth->acl_get('u_download') && $auth->acl_get('f_download', $forum_id))
{

Line 1514Line 1518
		$db->sql_freeresult($result);

// No attachments exist, but post table thinks they do so go ahead and reset post_attach flags

		$db->sql_freeresult($result);

// No attachments exist, but post table thinks they do so go ahead and reset post_attach flags

		if (!sizeof($attachments))

		if (!count($attachments))

		{
$sql = 'UPDATE ' . POSTS_TABLE . '
SET post_attachment = 0

		{
$sql = 'UPDATE ' . POSTS_TABLE . '
SET post_attachment = 0

Line 1522Line 1526
			$db->sql_query($sql);

// We need to update the topic indicator too if the complete topic is now without an attachment

			$db->sql_query($sql);

// We need to update the topic indicator too if the complete topic is now without an attachment

			if (sizeof($rowset) != $total_posts)

			if (count($rowset) != $total_posts)

			{
// Not all posts are displayed so we query the db to find if there's any attachment for this topic
$sql = 'SELECT a.post_msg_id as post_id

			{
// Not all posts are displayed so we query the db to find if there's any attachment for this topic
$sql = 'SELECT a.post_msg_id as post_id

Line 1579Line 1583
// Get the list of permanently banned users
$permanently_banned_users = phpbb_get_banned_user_ids(array_keys($user_cache), false);


// Get the list of permanently banned users
$permanently_banned_users = phpbb_get_banned_user_ids(array_keys($user_cache), false);


$i_total = sizeof($rowset) - 1;

$i_total = count($rowset) - 1;

$prev_post_id = '';

$template->assign_vars(array(
'S_HAS_ATTACHMENTS' => $topic_data['topic_attachment'],

$prev_post_id = '';

$template->assign_vars(array(
'S_HAS_ATTACHMENTS' => $topic_data['topic_attachment'],

	'S_NUM_POSTS' => sizeof($post_list))

	'S_NUM_POSTS' => count($post_list))

);

/**

);

/**

Line 1629Line 1633

// Output the posts
$first_unread = $post_unread = false;


// Output the posts
$first_unread = $post_unread = false;

for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i)

for ($i = 0, $end = count($post_list); $i < $end; ++$i)

{
// A non-existing rowset only happens if there was no user present for the entered poster_id
// This could be a broken posts table.

{
// A non-existing rowset only happens if there was no user present for the entered poster_id
// This could be a broken posts table.

Line 1672Line 1676
	if (($row['post_edit_count'] && $config['display_last_edited']) || $row['post_edit_reason'])
{
// Get usernames for all following posts if not already stored

	if (($row['post_edit_count'] && $config['display_last_edited']) || $row['post_edit_reason'])
{
// Get usernames for all following posts if not already stored

		if (!sizeof($post_edit_list) && ($row['post_edit_reason'] || ($row['post_edit_user'] && !isset($user_cache[$row['post_edit_user']]))))

		if (!count($post_edit_list) && ($row['post_edit_reason'] || ($row['post_edit_user'] && !isset($user_cache[$row['post_edit_user']]))))

		{
// Remove all post_ids already parsed (we do not have to check them)
$post_storage_list = (!$store_reverse) ? array_slice($post_list, $i) : array_slice(array_reverse($post_list), $i);

		{
// Remove all post_ids already parsed (we do not have to check them)
$post_storage_list = (!$store_reverse) ? array_slice($post_list, $i) : array_slice(array_reverse($post_list), $i);

Line 1736Line 1740
	if ($row['post_visibility'] == ITEM_DELETED && $row['post_delete_user'])
{
// Get usernames for all following posts if not already stored

	if ($row['post_visibility'] == ITEM_DELETED && $row['post_delete_user'])
{
// Get usernames for all following posts if not already stored

		if (!sizeof($post_delete_list) && ($row['post_delete_reason'] || ($row['post_delete_user'] && !isset($user_cache[$row['post_delete_user']]))))

		if (!count($post_delete_list) && ($row['post_delete_reason'] || ($row['post_delete_user'] && !isset($user_cache[$row['post_delete_user']]))))

		{
// Remove all post_ids already parsed (we do not have to check them)
$post_storage_list = (!$store_reverse) ? array_slice($post_list, $i) : array_slice(array_reverse($post_list), $i);

		{
// Remove all post_ids already parsed (we do not have to check them)
$post_storage_list = (!$store_reverse) ? array_slice($post_list, $i) : array_slice(array_reverse($post_list), $i);

Line 1979Line 1983


'S_HAS_ATTACHMENTS' => (!empty($attachments[$row['post_id']])) ? true : false,



'S_HAS_ATTACHMENTS' => (!empty($attachments[$row['post_id']])) ? true : false,

		'S_MULTIPLE_ATTACHMENTS'	=> !empty($attachments[$row['post_id']]) && sizeof($attachments[$row['post_id']]) > 1,

		'S_MULTIPLE_ATTACHMENTS'	=> !empty($attachments[$row['post_id']]) && count($attachments[$row['post_id']]) > 1,

		'S_POST_UNAPPROVED'	=> ($row['post_visibility'] == ITEM_UNAPPROVED || $row['post_visibility'] == ITEM_REAPPROVE) ? true : false,
'S_POST_DELETED' => ($row['post_visibility'] == ITEM_DELETED) ? true : false,
'L_POST_DELETED_MESSAGE' => $l_deleted_message,

		'S_POST_UNAPPROVED'	=> ($row['post_visibility'] == ITEM_UNAPPROVED || $row['post_visibility'] == ITEM_REAPPROVE) ? true : false,
'S_POST_DELETED' => ($row['post_visibility'] == ITEM_DELETED) ? true : false,
'L_POST_DELETED_MESSAGE' => $l_deleted_message,

Line 1988Line 1992
		'S_FRIEND'			=> ($row['friend']) ? true : false,
'S_UNREAD_POST' => $post_unread,
'S_FIRST_UNREAD' => $s_first_unread,

		'S_FRIEND'			=> ($row['friend']) ? true : false,
'S_UNREAD_POST' => $post_unread,
'S_FIRST_UNREAD' => $s_first_unread,

		'S_CUSTOM_FIELDS'	=> (isset($cp_row['row']) && sizeof($cp_row['row'])) ? true : false,

		'S_CUSTOM_FIELDS'	=> (isset($cp_row['row']) && count($cp_row['row'])) ? true : false,

		'S_TOPIC_POSTER'	=> ($topic_data['topic_poster'] == $poster_id) ? true : false,

'S_IGNORE_POST' => ($row['foe']) ? true : false,

		'S_TOPIC_POSTER'	=> ($topic_data['topic_poster'] == $poster_id) ? true : false,

'S_IGNORE_POST' => ($row['foe']) ? true : false,

Line 2017Line 2021
	* @var	array	user_poster_data	Poster's data from user cache
* @var array post_row Template block array of the post
* @var array topic_data Array with topic data

	* @var	array	user_poster_data	Poster's data from user cache
* @var array post_row Template block array of the post
* @var array topic_data Array with topic data

 
	* @var	array	user_cache			Array with cached user data
* @var array post_edit_list Array with post edited list

	* @since 3.1.0-a1
* @changed 3.1.0-a3 Added vars start, current_row_number, end, attachments
* @changed 3.1.0-b3 Added topic_data array, total_posts
* @changed 3.1.0-RC3 Added poster_id

	* @since 3.1.0-a1
* @changed 3.1.0-a3 Added vars start, current_row_number, end, attachments
* @changed 3.1.0-b3 Added topic_data array, total_posts
* @changed 3.1.0-RC3 Added poster_id

 
	* @changed 3.2.2-RC1 Added user_cache and post_edit_list

	*/
$vars = array(
'start',

	*/
$vars = array(
'start',

Line 2034Line 2041
		'user_poster_data',
'post_row',
'topic_data',

		'user_poster_data',
'post_row',
'topic_data',

 
		'user_cache',
'post_edit_list',

	);
extract($phpbb_dispatcher->trigger_event('core.viewtopic_modify_post_row', compact($vars)));

$i = $current_row_number;


	);
extract($phpbb_dispatcher->trigger_event('core.viewtopic_modify_post_row', compact($vars)));

$i = $current_row_number;


	if (isset($cp_row['row']) && sizeof($cp_row['row']))

	if (isset($cp_row['row']) && count($cp_row['row']))

	{
$post_row = array_merge($post_row, $cp_row['row']);
}

	{
$post_row = array_merge($post_row, $cp_row['row']);
}

Line 2152Line 2161
	$db->sql_query($sql);

// Update the attachment download counts

	$db->sql_query($sql);

// Update the attachment download counts

	if (sizeof($update_count))

	if (count($update_count))

	{
$sql = 'UPDATE ' . ATTACHMENTS_TABLE . '
SET download_count = download_count + 1

	{
$sql = 'UPDATE ' . ATTACHMENTS_TABLE . '
SET download_count = download_count + 1