mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-21 16:10:38 +01:00
Code Issues Releases Wiki Activity

Merge branch '3.1.x' into 3.2.x

Browse Source
This commit is contained in:
Marc Alexander 2017-01-04 17:44:11 +01:00
commit 03be94c1f7
No known key found for this signature in database
GPG Key ID: 50E0D2423696F995
10 changed files with 161 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
phpBB/language/en/common.php
View File

@ -341,6 +341,7 @@ $lang = array_merge($lang, array(
'INTERESTS' => 'Interests',
'INVALID_DIGEST_CHALLENGE' => 'Invalid digest challenge.',
'INVALID_EMAIL_LOG' => '<strong>%s</strong> possibly an invalid email address?',
'INVALID_FEED_ATTACHMENTS' => 'The selected feed tried fetching attachments with invalid constraints.',
'INVALID_PLURAL_RULE' => 'The chosen plural rule is invalid. Valid values are integers between 0 and 15.',
'IP' => 'IP',
'IP_BLACKLISTED' => 'Your IP %1$s has been blocked because it is blacklisted. For details please see <a href="%2$s">%2$s</a>.',

34
phpBB/phpbb/feed/attachments_base.php
View File

@ -25,8 +25,11 @@ abstract class attachments_base extends base
/**
* Retrieve the list of attachments that may be displayed
*
* @param array $post_ids Specify for which post IDs to fetch the attachments (optional)
* @param array $topic_ids Specify for which topic IDs to fetch the attachments (optional)
*/
protected function fetch_attachments()
protected function fetch_attachments($post_ids = array(), $topic_ids = array())
{
$sql_array = array(
'SELECT' => 'a.*',
@ -37,7 +40,20 @@ abstract class attachments_base extends base
'ORDER_BY' => 'a.filetime DESC, a.post_msg_id ASC',
);
if (isset($this->topic_id))
if (!empty($post_ids))
{
$sql_array['WHERE'] .= 'AND ' . $this->db->sql_in_set('a.post_msg_id', $post_ids);
}
else if (!empty($topic_ids))
{
if (isset($this->topic_id))
{
$topic_ids[] = $this->topic_id;
}
$sql_array['WHERE'] .= 'AND ' . $this->db->sql_in_set('a.topic_id', $topic_ids);
}
else if (isset($this->topic_id))
{
$sql_array['WHERE'] .= 'AND a.topic_id = ' . (int) $this->topic_id;
}
@ -51,6 +67,11 @@ abstract class attachments_base extends base
);
$sql_array['WHERE'] .= 'AND t.forum_id = ' . (int) $this->forum_id;
}
else
{
// Do not allow querying the full attachments table
throw new \RuntimeException($this->user->lang('INVALID_FEED_ATTACHMENTS'));
}
$sql = $this->db->sql_build_query('SELECT', $sql_array);
$result = $this->db->sql_query($sql);
@ -63,15 +84,6 @@ abstract class attachments_base extends base
$this->db->sql_freeresult($result);
}
/**
* {@inheritDoc}
*/
public function open()
{
parent::open();
$this->fetch_attachments();
}
/**
* Get attachments related to a given post
*

2
phpBB/phpbb/feed/forum.php
View File

@ -138,6 +138,8 @@ class forum extends post_base
return false;
}
parent::fetch_attachments(array(), $topic_ids);
$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, p.post_attachment, ' .
'u.username, u.user_id',

2
phpBB/phpbb/feed/news.php
View File

@ -90,6 +90,8 @@ class news extends topic_base
return false;
}
parent::fetch_attachments($post_ids);
$this->sql = array(
'SELECT' => 'f.forum_id, f.forum_name,
t.topic_id, t.topic_title, t.topic_poster, t.topic_first_poster_name, t.topic_posts_approved, t.topic_posts_unapproved, t.topic_posts_softdeleted, t.topic_views, t.topic_time, t.topic_last_post_time,

2
phpBB/phpbb/feed/overall.php
View File

@ -55,6 +55,8 @@ class overall extends post_base
return false;
}
parent::fetch_attachments(array(), $topic_ids);
// Get the actual data
$this->sql = array(
'SELECT' => 'f.forum_id, f.forum_name, ' .

2
phpBB/phpbb/feed/topic.php
View File

@ -126,6 +126,8 @@ class topic extends post_base
*/
protected function get_sql()
{
parent::fetch_attachments();
$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, p.post_attachment, ' .
'u.username, u.user_id',

2
phpBB/phpbb/feed/topics.php
View File

@ -58,6 +58,8 @@ class topics extends topic_base
return false;
}
parent::fetch_attachments($post_ids);
$this->sql = array(
'SELECT' => 'f.forum_id, f.forum_name,
t.topic_id, t.topic_title, t.topic_poster, t.topic_first_poster_name, t.topic_posts_approved, t.topic_posts_unapproved, t.topic_posts_softdeleted, t.topic_views, t.topic_time, t.topic_last_post_time,

2
phpBB/phpbb/feed/topics_active.php
View File

@ -77,6 +77,8 @@ class topics_active extends topic_base
return false;
}
parent::fetch_attachments($post_ids);
$this->sql = array(
'SELECT' => 'f.forum_id, f.forum_name,
t.topic_id, t.topic_title, t.topic_posts_approved, t.topic_posts_unapproved, t.topic_posts_softdeleted, t.topic_views,

94
tests/feed/attachments_base_test.php Normal file
View File

@ -0,0 +1,94 @@
<?php
/**
*
* This file is part of the phpBB Forum Software package.
*
* @copyright (c) phpBB Limited <https://www.phpbb.com>
* @license GNU General Public License, version 2 (GPL-2.0)
*
* For full copyright and license information, please see
* the docs/CREDITS.txt file.
*
*/
require_once(dirname(__FILE__) . '/attachments_mock_feed.php');
class phpbb_feed_attachments_base_test extends phpbb_database_test_case
{
protected $filesystem;
/** @var \phpbb_feed_attachments_mock_feed */
protected $attachments_mocks_feed;
public function getDataSet()
{
return $this->createXMLDataSet(dirname(__FILE__) . '/../extension/fixtures/extensions.xml');
}
public function setUp()
{
global $phpbb_root_path, $phpEx;
$this->filesystem = new \phpbb\filesystem();
$config = new \phpbb\config\config(array());
$user = new \phpbb\user('\phpbb\datetime');
$feed_helper = new \phpbb\feed\helper($config, $user, $phpbb_root_path, $phpEx);
$db = $this->new_dbal();
$cache = new \phpbb_mock_cache();
$auth = new \phpbb\auth\auth();
$content_visibility = new \phpbb\content_visibility(
$auth,
$config,
new \phpbb_mock_event_dispatcher(),
$db,
$user,
$phpbb_root_path,
$phpEx,
FORUMS_TABLE,
POSTS_TABLE,
TOPICS_TABLE,
USERS_TABLE
);
$this->attachments_mocks_feed = new \phpbb_feed_attachments_mock_feed(
$feed_helper,
$config,
$db,
$cache,
$user,
$auth,
$content_visibility,
new \phpbb_mock_event_dispatcher(),
$phpEx
);
}
public function data_fetch_attachments()
{
return array(
array(array(0), array(0)),
array(array(), array(1)),
array(array(), array(), 'RuntimeException')
);
}
/**
* @dataProvider data_fetch_attachments
*/
public function test_fetch_attachments($post_ids, $topic_ids, $expected_exception = false)
{
$this->attachments_mocks_feed->post_ids = $post_ids;
$this->attachments_mocks_feed->topic_ids = $topic_ids;
if ($expected_exception !== false)
{
$this->setExpectedException($expected_exception);
$this->attachments_mocks_feed->get_sql();
}
else
{
$this->assertTrue($this->attachments_mocks_feed->get_sql());
}
}
}

31
tests/feed/attachments_mock_feed.php Normal file
View File

@ -0,0 +1,31 @@
<?php
/**
*
* This file is part of the phpBB Forum Software package.
*
* @copyright (c) phpBB Limited <https://www.phpbb.com>
* @license GNU General Public License, version 2 (GPL-2.0)
*
* For full copyright and license information, please see
* the docs/CREDITS.txt file.
*
*/
/**
* Board wide feed (aka overall feed)
*
* This will give you the newest {$this->num_items} posts
* from the whole board.
*/
class phpbb_feed_attachments_mock_feed extends \phpbb\feed\attachments_base
{
public $topic_ids = array();
public $post_ids = array();
function get_sql()
{
parent::fetch_attachments($this->post_ids, $this->topic_ids);
return true;
}
}