diff options
| -rw-r--r-- | phpBB/includes/feed/forum.php | 7 | ||||
| -rw-r--r-- | phpBB/includes/feed/overall.php | 4 | ||||
| -rw-r--r-- | phpBB/includes/feed/topic.php | 4 | ||||
| -rw-r--r-- | phpBB/includes/functions.php | 10 | ||||
| -rw-r--r-- | phpBB/viewforum.php | 6 | ||||
| -rw-r--r-- | phpBB/viewtopic.php | 19 | 
6 files changed, 15 insertions, 35 deletions
diff --git a/phpBB/includes/feed/forum.php b/phpBB/includes/feed/forum.php index fc217c203c..4a159ff3d4 100644 --- a/phpBB/includes/feed/forum.php +++ b/phpBB/includes/feed/forum.php @@ -90,14 +90,12 @@ class phpbb_feed_forum extends phpbb_feed_post_base  	function get_sql()  	{ -		$sql_visibility = $this->content_visibility->get_visibility_sql('topic', $this->forum_id); -  		// Determine topics with recent activity  		$sql = 'SELECT topic_id, topic_last_post_time  			FROM ' . TOPICS_TABLE . '  			WHERE forum_id = ' . $this->forum_id . '  				AND topic_moved_id = 0 -				' . (($sql_visibility) ? ' AND ' . $sql_visibility : '') . ' +				AND ' . $this->content_visibility->get_visibility_sql('topic', $this->forum_id) . '  			ORDER BY topic_last_post_time DESC';  		$result = $this->db->sql_query_limit($sql, $this->num_items); @@ -116,8 +114,6 @@ class phpbb_feed_forum extends phpbb_feed_post_base  			return false;  		} -		$sql_visibility = $this->content_visibility->get_visibility_sql('post', $this->forum_id, 'p.');  -  		$this->sql = array(  			'SELECT'	=>	'p.post_id, p.topic_id, p.post_time, p.post_edit_time, p.post_visibility, p.post_subject, p.post_text, p.bbcode_bitfield, p.bbcode_uid, p.enable_bbcode, p.enable_smilies, p.enable_magic_url, ' .  							'u.username, u.user_id', @@ -127,6 +123,7 @@ class phpbb_feed_forum extends phpbb_feed_post_base  			),  			'WHERE'		=> $this->db->sql_in_set('p.topic_id', $topic_ids) . '  							' . (($sql_visibility) ? ' AND ' . $sql_visibility : '') . ' +							AND ' . $this->content_visibility->get_visibility_sql('post', $this->forum_id, 'p.') . '  							AND p.post_time >= ' . $min_post_time . '  							AND p.poster_id = u.user_id',  			'ORDER_BY'	=> 'p.post_time DESC', diff --git a/phpBB/includes/feed/overall.php b/phpBB/includes/feed/overall.php index af45840d69..869df7cde0 100644 --- a/phpBB/includes/feed/overall.php +++ b/phpBB/includes/feed/overall.php @@ -56,8 +56,6 @@ class phpbb_feed_overall extends phpbb_feed_post_base  			return false;  		} -		$sql_visibility = $this->content_visibility->get_visibility_sql('post', array(), 'p.'); -  		// Get the actual data  		$this->sql = array(  			'SELECT'	=>	'f.forum_id, f.forum_name, ' . @@ -74,7 +72,7 @@ class phpbb_feed_overall extends phpbb_feed_post_base  				),  			),  			'WHERE'		=> $this->db->sql_in_set('p.topic_id', $topic_ids) . ' -							' . (($sql_visibility) ? ' AND ' . $sql_visibility : '') . ' +							AND ' . $this->content_visibility->get_visibility_sql('post', array(), 'p.') . '  							AND p.post_time >= ' . $min_post_time . '  							AND u.user_id = p.poster_id',  			'ORDER_BY'	=> 'p.post_time DESC', diff --git a/phpBB/includes/feed/topic.php b/phpBB/includes/feed/topic.php index 10f86486c6..36f958ac60 100644 --- a/phpBB/includes/feed/topic.php +++ b/phpBB/includes/feed/topic.php @@ -93,8 +93,6 @@ class phpbb_feed_topic extends phpbb_feed_post_base  	function get_sql()  	{ -		$sql_visibility = $this->content_visibility->get_visibility_sql('post', $this->forum_id, 'p.');  -  		$this->sql = array(  			'SELECT'	=>	'p.post_id, p.post_time, p.post_edit_time, p.post_visibility, p.post_subject, p.post_text, p.bbcode_bitfield, p.bbcode_uid, p.enable_bbcode, p.enable_smilies, p.enable_magic_url, ' .  							'u.username, u.user_id', @@ -103,7 +101,7 @@ class phpbb_feed_topic extends phpbb_feed_post_base  				USERS_TABLE		=> 'u',  			),  			'WHERE'		=> 'p.topic_id = ' . $this->topic_id . ' -								' . (($sql_visibility) ? ' AND ' . $sql_visibility : '') . ' +								AND ' . $this->content_visibility->get_visibility_sql('post', $this->forum_id, 'p.') . '  								AND p.poster_id = u.user_id',  			'ORDER_BY'	=> 'p.post_time DESC',  		); diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 9664b5663c..93ad723eda 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -2000,8 +2000,6 @@ function update_forum_tracking_info($forum_id, $forum_last_post_time, $f_mark_ti  	// Handle update of unapproved topics info.  	// Only update for moderators having m_approve permission for the forum.  	$phpbb_content_visibility = $phpbb_container->get('content.visibility'); -	$sql_update_unapproved = $phpbb_content_visibility->get_visibility_sql('topic', $forum_id, 't.'); -	$sql_update_unapproved = ($sql_update_unapproved) ? ' AND ' . $sql_update_unapproved : '';  	// Check the forum for any left unread topics.  	// If there are none, we mark the forum as read. @@ -2021,8 +2019,8 @@ function update_forum_tracking_info($forum_id, $forum_last_post_time, $f_mark_ti  						AND tt.user_id = ' . $user->data['user_id'] . ')  				WHERE t.forum_id = ' . $forum_id . '  					AND t.topic_last_post_time > ' . $mark_time_forum . ' -					AND t.topic_moved_id = 0 ' . -					$sql_update_unapproved . ' +					AND t.topic_moved_id = 0 +					AND ' . $phpbb_content_visibility->get_visibility_sql('topic', $forum_id, 't.') . '  					AND (tt.topic_id IS NULL  						OR tt.mark_time < t.topic_last_post_time)';  			$result = $db->sql_query_limit($sql, 1); @@ -2046,8 +2044,8 @@ function update_forum_tracking_info($forum_id, $forum_last_post_time, $f_mark_ti  				FROM ' . TOPICS_TABLE . ' t  				WHERE t.forum_id = ' . $forum_id . '  					AND t.topic_last_post_time > ' . $mark_time_forum . ' -					AND t.topic_moved_id = 0 ' . -					$sql_update_unapproved; +					AND t.topic_moved_id = 0 +					AND ' . $phpbb_content_visibility->get_visibility_sql('topic', $forum_id, 't.');  			$result = $db->sql_query($sql);  			$check_forum = $tracking_topics['tf'][$forum_id]; diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php index 4128fbdfeb..926670f9bf 100644 --- a/phpBB/viewforum.php +++ b/phpBB/viewforum.php @@ -252,7 +252,6 @@ $phpbb_content_visibility = $phpbb_container->get('content.visibility');  if ($sort_days)  {  	$min_post_time = time() - ($sort_days * 86400); -	$sql_visibility = $phpbb_content_visibility->get_visibility_sql('topic', $forum_id);  	$sql = 'SELECT COUNT(topic_id) AS num_topics  		FROM ' . TOPICS_TABLE . " @@ -260,7 +259,7 @@ if ($sort_days)  			AND (topic_last_post_time >= $min_post_time  				OR topic_type = " . POST_ANNOUNCE . '  				OR topic_type = ' . POST_GLOBAL . ') -			' . (($sql_visibility) ? ' AND ' . $sql_visibility : ''); +			AND ' . $phpbb_content_visibility->get_visibility_sql('topic', $forum_id);  	$result = $db->sql_query($sql);  	$topics_count = (int) $db->sql_fetchfield('num_topics');  	$db->sql_freeresult($result); @@ -373,8 +372,7 @@ $sql_array = array(  	'LEFT_JOIN'	=> array(),  ); -$sql_approved = $phpbb_content_visibility->get_visibility_sql('topic', $forum_id, 't.'); -$sql_approved = ($sql_approved) ? ' AND ' . $sql_approved : ''; +$sql_approved = ' AND ' . $phpbb_content_visibility->get_visibility_sql('topic', $forum_id, 't.');  if ($user->data['is_registered'])  { diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index db8a192180..55c8d8e5b3 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -79,14 +79,12 @@ if ($view && !$post_id)  	{  		// Get topic tracking info  		$topic_tracking_info = get_complete_topic_tracking($forum_id, $topic_id); -  		$topic_last_read = (isset($topic_tracking_info[$topic_id])) ? $topic_tracking_info[$topic_id] : 0; -		$sql_visibility = $phpbb_content_visibility->get_visibility_sql('post', $forum_id);  		$sql = 'SELECT post_id, topic_id, forum_id  			FROM ' . POSTS_TABLE . "  			WHERE topic_id = $topic_id -				" . (($sql_visibility) ? ' AND ' . $sql_visibility : '') . " +				AND " . $phpbb_content_visibility->get_visibility_sql('post', $forum_id) . "  				AND post_time > $topic_last_read  				AND forum_id = $forum_id  			ORDER BY post_time ASC"; @@ -135,14 +133,12 @@ if ($view && !$post_id)  		}  		else  		{ -			$sql_visibility = $phpbb_content_visibility->get_visibility_sql('topic', $row['forum_id']); -  			$sql = 'SELECT topic_id, forum_id  				FROM ' . TOPICS_TABLE . '  				WHERE forum_id = ' . $row['forum_id'] . "  					AND topic_moved_id = 0  					AND topic_last_post_time $sql_condition {$row['topic_last_post_time']} -					" . (($sql_visibility) ? ' AND ' . $sql_visibility : '') . " +					AND " . $phpbb_content_visibility->get_visibility_sql('topic', $row['forum_id']) . "  				ORDER BY topic_last_post_time $sql_ordering";  			$result = $db->sql_query_limit($sql, 1);  			$row = $db->sql_fetchrow($result); @@ -286,12 +282,10 @@ if ($post_id)  	}  	else  	{ -		$sql_visibility = $phpbb_content_visibility->get_visibility_sql('post', $forum_id, 'p.'); -  		$sql = 'SELECT COUNT(p.post_id) AS prev_posts  			FROM ' . POSTS_TABLE . " p  			WHERE p.topic_id = {$topic_data['topic_id']} -				" . (($sql_visibility) ? ' AND ' . $sql_visibility : ''); +				AND " . $phpbb_content_visibility->get_visibility_sql('post', $forum_id, 'p.');  		if ($sort_dir == 'd')  		{ @@ -405,13 +399,12 @@ gen_sort_selects($limit_days, $sort_by_text, $sort_days, $sort_key, $sort_dir, $  if ($sort_days)  {  	$min_post_time = time() - ($sort_days * 86400); -	$sql_visibility = $phpbb_content_visibility->get_visibility_sql('post', $forum_id);  	$sql = 'SELECT COUNT(post_id) AS num_posts  		FROM ' . POSTS_TABLE . "  		WHERE topic_id = $topic_id  			AND post_time >= $min_post_time -				" . (($sql_visibility) ? ' AND ' . $sql_visibility : ''); +				AND " . $phpbb_content_visibility->get_visibility_sql('post', $forum_id);  	$result = $db->sql_query($sql);  	$total_posts = (int) $db->sql_fetchfield('num_posts');  	$db->sql_freeresult($result); @@ -946,12 +939,10 @@ $bbcode_bitfield = '';  $i = $i_total = 0;  // Go ahead and pull all data for this topic -$sql_visibility = $phpbb_content_visibility->get_visibility_sql('post', $forum_id, 'p.'); -  $sql = 'SELECT p.post_id  	FROM ' . POSTS_TABLE . ' p' . (($join_user_sql[$sort_key]) ? ', ' . USERS_TABLE . ' u': '') . "  	WHERE p.topic_id = $topic_id -		" . (($sql_visibility) ? ' AND ' . $sql_visibility : '') . " +		AND " . $phpbb_content_visibility->get_visibility_sql('post', $forum_id, 'p.') . "  		" . (($join_user_sql[$sort_key]) ? 'AND u.user_id = p.poster_id': '') . "  		$limit_posts_time  	ORDER BY $sql_sort_order";  | 
