6 files changed, 2012 insertions, 3 deletions
diff --git a/tests/functional/feed_test.php b/tests/functional/feed_test.php
new file mode 100644
index 0000000000..86d3930a7b
--- /dev/null
+++ b/tests/functional/feed_test.php
@@ -0,0 +1,1490 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2014 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @group functional
+*/
+class phpbb_functional_feed_test extends phpbb_functional_test_case
+{
+	protected $data = array();
+
+	static public $init_values = array();
+
+	public function __construct($name = null, array $data = array(), $dataName = '')
+	{
+		parent::__construct($name, $data, $dataName);
+
+		$this->backupStaticAttributesBlacklist += array(
+			'phpbb_functional_feed_test' => array('init_values'),
+		);
+	}
+
+	public function test_setup_config_before_state()
+	{
+		$this->login();
+		$this->admin_login();
+
+		$crawler = self::request('GET', "adm/index.php?sid={$this->sid}&i=acp_board&mode=feed");
+
+		$form = $crawler->selectButton('Submit')->form();
+		$values = $form->getValues();
+
+		self::$init_values['post_base_items'] = (int) $values['config[feed_limit_post]'];
+		self::$init_values['topic_base_items'] = (int) $values['config[feed_limit_topic]'];
+
+		// Enable all feeds
+		$values['config[feed_enable]'] = true;
+		$values['config[feed_forum]'] = true;
+		$values['config[feed_item_statistics]'] = true;
+		$values['config[feed_overall]'] = true;
+		$values['config[feed_overall_forums]'] = true;
+		$values['config[feed_topic]'] = true;
+		$values['config[feed_topics_active]'] = true;
+		$values['config[feed_topics_new]'] = true;
+
+		$form->setValues($values);
+
+		$crawler = self::submit($form);
+		$this->assertContainsLang('CONFIG_UPDATED', $crawler->filter('.successbox')->text());
+
+		// Special config (Guest can't see attachments)
+		$this->add_lang('acp/permissions');
+
+		$crawler = self::request('GET', "adm/index.php?i=acp_permissions&sid={$this->sid}&icat=16&mode=setting_group_global&group_id[0]=1");
+		$this->assertContains($this->lang('ACL_SET'), $crawler->filter('h1')->eq(1)->text());
+
+		$form = $crawler->selectButton($this->lang('APPLY_PERMISSIONS'))->form();
+		$form['setting[1][0][u_download]']->select(-1);
+
+		$crawler = self::submit($form);
+		$this->assertContainsLang('AUTH_UPDATED', $crawler->filter('.successbox')->text());
+	}
+
+	public function test_dump_board_state()
+	{
+		$crawler = self::request('GET', 'feed.php?mode=forums', array(), false);
+		self::assert_response_xml();
+		self::$init_values['disapprove_user']['forums_value'] = $crawler->filterXPath('//entry')->count();
+
+		$crawler = self::request('GET', 'feed.php?mode=overall', array(), false);
+		self::assert_response_xml();
+		self::$init_values['disapprove_user']['overall_value'] = $crawler->filterXPath('//entry')->count();
+
+		$crawler = self::request('GET', 'feed.php?mode=topics', array(), false);
+		self::assert_response_xml();
+		self::$init_values['disapprove_user']['topics_value'] = $crawler->filterXPath('//entry')->count();
+
+		$crawler = self::request('GET', 'feed.php?mode=topics_new', array(), false);
+		self::assert_response_xml();
+		self::$init_values['disapprove_user']['topics_new_value'] = $crawler->filterXPath('//entry')->count();
+
+		$crawler = self::request('GET', 'feed.php?mode=topics_active', array(), false);
+		self::assert_response_xml();
+		self::$init_values['disapprove_user']['topics_active_value'] = $crawler->filterXPath('//entry')->count();
+
+		$this->login();
+
+		$crawler = self::request('GET', 'feed.php?mode=forums', array(), false);
+		self::assert_response_xml();
+		self::$init_values['admin']['forums_value'] = $crawler->filterXPath('//entry')->count();
+
+		$crawler = self::request('GET', 'feed.php?mode=overall', array(), false);
+		self::assert_response_xml();
+		self::$init_values['admin']['overall_value'] = $crawler->filterXPath('//entry')->count();
+
+		$crawler = self::request('GET', 'feed.php?mode=topics', array(), false);
+		self::assert_response_xml();
+		self::$init_values['admin']['topics_value'] = $crawler->filterXPath('//entry')->count();
+
+		$crawler = self::request('GET', 'feed.php?mode=topics_new', array(), false);
+		self::assert_response_xml();
+		self::$init_values['admin']['topics_new_value'] = $crawler->filterXPath('//entry')->count();
+
+		$crawler = self::request('GET', 'feed.php?mode=topics_active', array(), false);
+		self::assert_response_xml();
+		self::$init_values['admin']['topics_active_value'] = $crawler->filterXPath('//entry')->count();
+
+
+	}
+
+	public function test_setup_forums()
+	{
+		$this->login();
+		$this->admin_login();
+		$this->create_user('disapprove_user');
+		$this->add_user_group('NEWLY_REGISTERED', array('disapprove_user'));
+
+		$crawler = self::request('GET', "adm/index.php?i=acp_forums&mode=manage&sid={$this->sid}");
+		$form = $crawler->selectButton('addforum')->form(array(
+			'forum_name'	=> 'Feeds #1',
+		));
+		$crawler = self::submit($form);
+		$form = $crawler->selectButton('update')->form(array(
+			'forum_perm_from'	=> 2,
+		));
+		$crawler = self::submit($form);
+
+		$this->load_ids(array(
+			'forums' => array(
+				'Feeds #1',
+			),
+		));
+
+		// 'Feeds #1.1' is a sub-forum of 'Feeds #1'
+		$crawler = self::request('GET', "adm/index.php?i=acp_forums&sid={$this->sid}&icat=6&mode=manage&parent_id={$this->data['forums']['Feeds #1']}");
+		$form = $crawler->selectButton('addforum')->form(array(
+			'forum_name'	=> 'Feeds #1.1',
+		));
+		$crawler = self::submit($form);
+		$form = $crawler->selectButton('update')->form(array(
+			'forum_perm_from'	=> 2,
+		));
+		$crawler = self::submit($form);
+
+		// 'Feeds #news' will be used for feed.php?mode=news
+		$crawler = self::request('GET', "adm/index.php?i=acp_forums&mode=manage&sid={$this->sid}");
+		$form = $crawler->selectButton('addforum')->form(array(
+			'forum_name'	=> 'Feeds #news',
+		));
+		$crawler = self::submit($form);
+		$form = $crawler->selectButton('update')->form(array(
+			'forum_perm_from'	=> 2,
+		));
+		$crawler = self::submit($form);
+
+		// 'Feeds #exclude' will not be displayed on feed.php?mode=forums
+		$crawler = self::request('GET', "adm/index.php?i=acp_forums&mode=manage&sid={$this->sid}");
+		$form = $crawler->selectButton('addforum')->form(array(
+			'forum_name'	=> 'Feeds #exclude',
+		));
+		$crawler = self::submit($form);
+		$form = $crawler->selectButton('update')->form(array(
+			'forum_perm_from'	=> 2,
+		));
+		$crawler = self::submit($form);
+	}
+
+	public function test_setup_config_after_forums()
+	{
+		$this->login();
+		$this->admin_login();
+
+		$this->load_ids(array(
+			'forums' => array(
+				'Feeds #news',
+				'Feeds #exclude',
+			),
+		));
+
+		$crawler = self::request('GET', "adm/index.php?sid={$this->sid}&i=acp_board&mode=feed");
+
+		$form = $crawler->selectButton('Submit')->form();
+
+		// News/Exclude's forums config
+		$form['feed_news_id']->select(array($this->data['forums']['Feeds #news']));
+		$form['feed_exclude_id']->select(array($this->data['forums']['Feeds #exclude']));
+
+		$crawler = self::submit($form);
+		$this->assertContainsLang('CONFIG_UPDATED', $crawler->filter('.successbox')->text());
+	}
+
+	public function test_feeds_empty()
+	{
+		$this->load_ids(array(
+			'forums' => array(
+				'Feeds #1',
+				'Feeds #1.1',
+			),
+		));
+
+		// Excluded forums (and topics under them) shouldn't be displayed in feeds
+		$this->assert_feeds(array(
+			'f' => array(
+				array(
+					'id' => $this->data['forums']['Feeds #1'],
+					'nb_entries' => 0,
+				),
+				array(
+					'id' => $this->data['forums']['Feeds #1.1'],
+					'nb_entries' => 0,
+				),
+			),
+			'forums' => array(
+				array(
+					'nb_entries' => 3,
+					'xpath' => array(
+						'//entry/category[@label="Feeds #exclude"]' => 0,
+					),
+				),
+			),
+			'news' => array(
+				array(
+					'nb_entries' => 0,
+				),
+			),
+		), 'admin');
+	}
+
+	public function test_create_exclude_topic()
+	{
+		$this->login();
+		$this->load_ids(array(
+			'forums' => array(
+				'Feeds #exclude',
+			),
+		));
+
+		$post = $this->create_topic($this->data['forums']['Feeds #exclude'], 'Feeds #exclude - Topic #1', 'This is a test topic posted by the testing framework.');
+		$this->data['topics']['Feeds #exclude - Topic #1'] = (int) $post['topic_id'];
+	}
+
+	public function test_feeds_exclude()
+	{
+		$this->load_ids(array(
+			'forums' => array(
+				'Feeds #exclude',
+			),
+			'topics' => array(
+				'Feeds #exclude - Topic #1',
+			),
+		));
+
+		// Assert that feeds aren't available for excluded forums
+		$this->assert_feeds(array(
+			'f' => array(
+				array(
+					'id' => $this->data['forums']['Feeds #exclude'],
+					'contents_lang' => array('NO_FEED'),
+					'invalid' => true,
+				),
+			),
+			't' => array(
+				array(
+					'id' => $this->data['topics']['Feeds #exclude - Topic #1'],
+					'contents_lang' => array('NO_FEED'),
+					'invalid' => true,
+				),
+			),
+			'overall' => array(
+				array(
+					'nb_entries' => 0,
+					'xpath' => array(
+						'//entry/title[contains(., "#exclude")]' => 0,
+					),
+				),
+			),
+			'topics' => array(
+				array(
+					'nb_entries' => 0,
+					'xpath' => array(
+						'//entry/title[contains(., "#exclude")]' => 0,
+					),
+				),
+			),
+			'topics_new' => array(
+				array(
+					'nb_entries' => 0,
+					'xpath' => array(
+						'//entry/title[contains(., "#exclude")]' => 0,
+					),
+				),
+			),
+			'topics_active' => array(
+				array(
+					'nb_entries' => 0,
+					'xpath' => array(
+						'//entry/title[contains(., "#exclude")]' => 0,
+					),
+				),
+			),
+		), 'admin');
+	}
+
+	public function test_create_news_topics()
+	{
+		$this->login();
+		$this->load_ids(array(
+			'forums' => array(
+				'Feeds #news',
+			),
+		));
+
+		$post = $this->create_topic($this->data['forums']['Feeds #news'], 'Feeds #news - Topic #1', 'This is a test topic posted by the testing framework.');
+		$this->data['topics']['Feeds #news - Topic #1'] = (int) $post['topic_id'];
+
+		// Travis is too fast, so we have to wait
+		sleep(1);
+
+		$post = $this->create_topic($this->data['forums']['Feeds #news'], 'Feeds #news - Topic #2', 'This is a test topic posted by the testing framework.');
+		$crawler = self::request('GET', "viewtopic.php?t={$post['topic_id']}&sid={$this->sid}");
+
+		// Travis is too fast, so we have to wait
+		sleep(1);
+
+		$this->assertContains('Feeds #news - Topic #2', $crawler->filter('html')->text());
+		$this->data['topics']['Feeds #news - Topic #2'] = (int) $post['topic_id'];
+		$this->data['posts']['Feeds #news - Topic #2'] = (int) $this->get_parameter_from_link($crawler->filter('.post')->selectLink($this->lang('POST', '', ''))->link()->getUri(), 'p');
+
+		// Test creating a reply
+		$post2 = $this->create_post($this->data['forums']['Feeds #news'], $post['topic_id'], 'Re: Feeds #news - Topic #2', 'This is a test post posted by the testing framework.');
+		$crawler = self::request('GET', "viewtopic.php?t={$post2['topic_id']}&sid={$this->sid}");
+
+		$this->assertContains('Re: Feeds #news - Topic #2', $crawler->filter('html')->text());
+		$this->data['posts']['Re: Feeds #news - Topic #2'] = (int) $post2['post_id'];
+	}
+
+	public function test_feeds_news_admin()
+	{
+		$this->load_ids(array(
+			'forums' => array(
+				'Feeds #news',
+			),
+			'topics' => array(
+				'Feeds #news - Topic #1',
+				'Feeds #news - Topic #2',
+			),
+			'posts' => array(
+				'Feeds #news - Topic #2',
+			),
+		));
+
+		// Assert that the first post of the two topics are displayed in news feed
+		$this->assert_feeds(array(
+			'news' => array(
+				array(
+					'nb_entries' => 2,
+					'contents' => array(
+						1 => 'This is a test topic posted by the testing framework.',
+						2 => 'This is a test topic posted by the testing framework.',
+					),
+				),
+			),
+			// News should also be displayed in other feeds
+			'f' => array(
+				array(
+					'nb_entries' => 3,
+					'id' => $this->data['forums']['Feeds #news'],
+				),
+			),
+			't' => array(
+				array(
+					'nb_entries' => 1,
+					'id' => $this->data['topics']['Feeds #news - Topic #1'],
+				),
+				array(
+					'nb_entries' => 2,
+					'id' => $this->data['topics']['Feeds #news - Topic #2'],
+				),
+			),
+			'overall' => array(
+				array(
+					'nb_entries' => 3,
+					'xpath' => array(
+						'//entry/title[contains(., "#news")]' => 3,
+					),
+				),
+			),
+			'topics' => array(
+				array(
+					'nb_entries' => 2,
+					'xpath' => array(
+						'//entry/title[contains(., "#news")]' => 2,
+					),
+				),
+			),
+			'topics_new' => array(
+				array(
+					'nb_entries' => 2,
+					'xpath' => array(
+						'//entry/title[contains(., "#news")]' => 2,
+					),
+				),
+			),
+			'topics_active' => array(
+				array(
+					'nb_entries' => 2,
+					'xpath' => array(
+						'//entry/title[contains(., "#news")]' => 2,
+					),
+				),
+			),
+		), 'admin');
+	}
+
+	public function test_feeds_news_guest()
+	{
+		$this->load_ids(array(
+			'posts' => array(
+				'Feeds #news - Topic #2',
+			),
+		));
+
+		// Assert that first post of the the two topics are displayed in news feed
+		$this->assert_feeds(array(
+			'news' => array(
+				array(
+					'nb_entries' => 2,
+					'contents' => array(
+						1 => 'This is a test topic posted by the testing framework.',
+						2 => 'This is a test topic posted by the testing framework.',
+					),
+				),
+			),
+		));
+	}
+
+	public function test_create_sub_forum_topic()
+	{
+		$this->login();
+		$this->load_ids(array(
+			'forums' => array(
+				'Feeds #1',
+				'Feeds #1.1',
+			),
+		));
+
+		$post = $this->create_topic($this->data['forums']['Feeds #1'], 'Feeds #1 - Topic #1', 'This is a test topic posted by the testing framework.');
+		$this->data['topics']['Feeds #1 - Topic #1'] = (int) $post['topic_id'];
+
+		// Travis is too fast, so we have to wait
+		sleep(1);
+
+		$post = $this->create_topic($this->data['forums']['Feeds #1.1'], 'Feeds #1.1 - Topic #1', 'This is a test topic posted by the testing framework.');
+		$this->data['topics']['Feeds #1.1 - Topic #1'] = (int) $post['topic_id'];
+	}
+
+	public function test_feeds_sub_forum()
+	{
+		$this->load_ids(array(
+			'forums' => array(
+				'Feeds #1',
+			),
+		));
+
+		// The topics of the sub-forum shouldn't be displayed
+		$this->assert_feeds(array(
+			'f' => array(
+				array(
+					'nb_entries' => 1,
+					'id' => $this->data['forums']['Feeds #1'],
+				),
+			),
+		), 'admin');
+	}
+
+	public function test_create_softdelete_post()
+	{
+		$this->login();
+		$this->load_ids(array(
+			'forums' => array(
+				'Feeds #1',
+			),
+		));
+
+		$post = $this->create_topic($this->data['forums']['Feeds #1'], 'Feeds #1 - Topic #2', 'This is a test topic posted by the testing framework.');
+		$this->data['topics']['Feeds #1 - Topic #2'] = (int) $post['topic_id'];
+
+		// Travis is too fast, so we have to wait
+		sleep(1);
+
+		// Test creating a reply
+		$post2 = $this->create_post($this->data['forums']['Feeds #1'], $post['topic_id'], 'Re: Feeds #1 - Topic #2', 'This is a test post posted by the testing framework.');
+		$crawler = self::request('GET', "viewtopic.php?t={$post2['topic_id']}&sid={$this->sid}");
+
+		$this->assertContains('Re: Feeds #1 - Topic #2', $crawler->filter('html')->text());
+		$this->data['posts']['Re: Feeds #1 - Topic #2'] = (int) $post2['post_id'];
+	}
+
+	public function test_softdelete_post()
+	{
+		$this->login();
+		$this->load_ids(array(
+			'forums' => array(
+				'Feeds #1',
+			),
+			'topics' => array(
+				'Feeds #1 - Topic #2',
+			),
+			'posts' => array(
+				'Re: Feeds #1 - Topic #2',
+			),
+		));
+		$this->add_lang('posting');
+
+		$crawler = self::request('GET', "posting.php?mode=delete&f={$this->data['forums']['Feeds #1']}&p={$this->data['posts']['Re: Feeds #1 - Topic #2']}&sid={$this->sid}");
+		$this->assertContainsLang('DELETE_PERMANENTLY', $crawler->text());
+
+		$form = $crawler->selectButton('Yes')->form();
+		$crawler = self::submit($form);
+		$this->assertContainsLang('POST_DELETED', $crawler->text());
+
+		$crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Feeds #1 - Topic #2']}&sid={$this->sid}");
+		$this->assertContains($this->lang('POST_DISPLAY', '', ''), $crawler->text());
+	}
+
+	public function test_feeds_softdeleted_post_admin()
+	{
+		$this->load_ids(array(
+			'forums' => array(
+				'Feeds #1',
+			),
+			'topics' => array(
+				'Feeds #1 - Topic #2',
+			),
+		));
+
+		// Assert that the soft-deleted post is marked as soft-delete for users that have the right to see it.
+		$this->assert_feeds(array(
+			'f' => array(
+				array(
+					'nb_entries' => 3,
+					'id' => $this->data['forums']['Feeds #1'],
+					'contents_lang' => array(
+						1 => 'POST_DELETED',
+					),
+				),
+			),
+			't' => array(
+				array(
+					'nb_entries' => 2,
+					'id' => $this->data['topics']['Feeds #1 - Topic #2'],
+					'contents_lang' => array(
+						1 => 'POST_DELETED',
+					),
+				),
+			),
+			'overall' => array(
+				array(
+					'nb_entries' => 7,
+					'contents_lang' => array(
+						1 => 'POST_DELETED',
+					),
+				),
+			),
+		), 'admin');
+	}
+
+	public function test_feeds_softdeleted_post_guest()
+	{
+		$this->load_ids(array(
+			'forums' => array(
+				'Feeds #1',
+			),
+			'topics' => array(
+				'Feeds #1 - Topic #2',
+			),
+		));
+
+		// Assert that the soft-deleted post is marked as soft-delete for users that have the right to see it.
+		$this->assert_feeds(array(
+			'f' => array(
+				array(
+					'nb_entries' => 2,
+					'id' => $this->data['forums']['Feeds #1'],
+				),
+			),
+			't' => array(
+				array(
+					'nb_entries' => 1,
+					'id' => $this->data['topics']['Feeds #1 - Topic #2'],
+				),
+			),
+			'overall' => array(
+				array(
+					'nb_entries' => 6,
+				),
+			),
+		));
+	}
+
+	public function test_softdelete_topic()
+	{
+		$this->login();
+		$this->load_ids(array(
+			'forums' => array(
+				'Feeds #1',
+			),
+			'topics' => array(
+				'Feeds #1 - Topic #2',
+			),
+		));
+
+		$crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Feeds #1 - Topic #2']}&sid={$this->sid}");
+
+		$this->add_lang('posting');
+		$form = $crawler->selectButton('Go')->eq(2)->form();
+		$form['action']->select('delete_topic');
+		$crawler = self::submit($form);
+		$this->assertContainsLang('DELETE_PERMANENTLY', $crawler->text());
+
+		$this->add_lang('mcp');
+		$form = $crawler->selectButton('Yes')->form();
+		$crawler = self::submit($form);
+		$this->assertContainsLang('TOPIC_DELETED_SUCCESS', $crawler->text());
+
+		$crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Feeds #1 - Topic #2']}&sid={$this->sid}");
+		$this->assertContains('Feeds #1 - Topic #2', $crawler->filter('h2')->text());
+	}
+
+	public function test_feeds_softdeleted_topic_admin()
+	{
+		$this->load_ids(array(
+			'forums' => array(
+				'Feeds #1',
+			),
+			'topics' => array(
+				'Feeds #1 - Topic #2',
+			),
+		));
+
+		// Assert that the soft-deleted post is marked as soft-delete for users that have the right to see it.
+		$this->assert_feeds(array(
+			'f' => array(
+				array(
+					'nb_entries' => 3,
+					'id' => $this->data['forums']['Feeds #1'],
+					'contents_lang' => array(
+						1 => 'POST_DELETED',
+						2 => 'POST_DELETED',
+					),
+				),
+			),
+			't' => array(
+				array(
+					'nb_entries' => 2,
+					'id' => $this->data['topics']['Feeds #1 - Topic #2'],
+					'contents_lang' => array(
+						1 => 'POST_DELETED',
+						2 => 'POST_DELETED',
+					),
+				),
+			),
+			'overall' => array(
+				array(
+					'nb_entries' => 7,
+					'contents_lang' => array(
+						1 => 'POST_DELETED',
+						2 => 'POST_DELETED',
+					),
+				),
+			),
+			'topics' => array(
+				array(
+					'nb_entries' => 5,
+					'contents_lang' => array(
+						1 => 'TOPIC_DELETED',
+					),
+				),
+			),
+			'topics_new' => array(
+				array(
+					'nb_entries' => 5,
+					'contents_lang' => array(
+						1 => 'TOPIC_DELETED',
+					),
+				),
+			),
+			'topics_active' => array(
+				array(
+					'nb_entries' => 5,
+					'contents_lang' => array(
+						1 => 'TOPIC_DELETED',
+					),
+				),
+			),
+		), 'admin');
+	}
+
+	public function test_feeds_softdeleted_topic_guest()
+	{
+		$this->load_ids(array(
+			'forums' => array(
+				'Feeds #1',
+			),
+			'topics' => array(
+				'Feeds #1 - Topic #2',
+			),
+		));
+
+		$this->assert_feeds(array(
+			'f' => array(
+				array(
+					'nb_entries' => 1,
+					'id' => $this->data['forums']['Feeds #1'],
+				),
+			),
+			't' => array(
+				array(
+					'id' => $this->data['topics']['Feeds #1 - Topic #2'],
+					'contents_lang' => array('SORRY_AUTH_READ'),
+					'invalid' => true,
+				),
+			),
+			'overall' => array(
+				array(
+					'nb_entries' => 5,
+				),
+			),
+			'topics' => array(
+				array(
+					'nb_entries' => 4,
+				),
+			),
+			'topics_new' => array(
+				array(
+					'nb_entries' => 4,
+				),
+			),
+			'topics_active' => array(
+				array(
+					'nb_entries' => 4,
+				),
+			),
+		));
+	}
+
+	public function test_create_unapproved_post()
+	{
+		$this->load_ids(array(
+			'forums' => array(
+				'Feeds #1.1',
+			),
+		));
+
+		$this->login('admin');
+		$post = $this->create_topic($this->data['forums']['Feeds #1.1'], 'Feeds #1.1 - Topic #2', 'This is a test topic posted by the testing framework.');
+		$this->data['topics']['Feeds #1.1 - Topic #2'] = (int) $post['topic_id'];
+		$this->logout();
+
+		// Test creating a reply
+		$this->login('disapprove_user');
+		$post2 = $this->create_post($this->data['forums']['Feeds #1.1'], $post['topic_id'], 'Re: Feeds #1.1 - Topic #2', 'This is a test post posted by the testing framework.', array(), 'POST_STORED_MOD');
+
+		$crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Feeds #1.1 - Topic #2']}&sid={$this->sid}");
+		$this->assertNotContains('Re: Feeds #1.1 - Topic #2', $crawler->filter('html')->text());
+	}
+
+	public function test_feeds_unapproved_post_admin()
+	{
+		$this->load_ids(array(
+			'forums' => array(
+				'Feeds #1.1',
+			),
+			'topics' => array(
+				'Feeds #1.1 - Topic #2',
+			),
+		));
+
+		// Assert that the unapproved post is marked as unapproved for users that have the right to see it.
+		$this->assert_feeds(array(
+			'f' => array(
+				array(
+					'nb_entries' => 3,
+					'id' => $this->data['forums']['Feeds #1.1'],
+					'contents_lang' => array(
+						1 => 'POST_UNAPPROVED',
+					),
+				),
+			),
+			't' => array(
+				array(
+					'nb_entries' => 2,
+					'id' => $this->data['topics']['Feeds #1.1 - Topic #2'],
+					'contents_lang' => array(
+						1 => 'POST_UNAPPROVED',
+					),
+				),
+			),
+			'overall' => array(
+				array(
+					'nb_entries' => 9,
+					'contents_lang' => array(
+						1 => 'POST_UNAPPROVED',
+					),
+				),
+			),
+		), 'admin');
+	}
+
+	public function test_feeds_unapproved_post_disapprove_user()
+	{
+		$this->load_ids(array(
+			'forums' => array(
+				'Feeds #1.1',
+			),
+			'topics' => array(
+				'Feeds #1.1 - Topic #2',
+			),
+		));
+
+		// Assert that the unapproved isn't displayed for regular users
+		$this->assert_feeds(array(
+			'f' => array(
+				array(
+					'nb_entries' => 2,
+					'id' => $this->data['forums']['Feeds #1.1'],
+				),
+			),
+			't' => array(
+				array(
+					'nb_entries' => 1,
+					'id' => $this->data['topics']['Feeds #1.1 - Topic #2'],
+				),
+			),
+			'overall' => array(
+				array(
+					'nb_entries' => 6,
+				),
+			),
+		), 'disapprove_user');
+	}
+
+	public function test_create_unapproved_topic()
+	{
+		$this->load_ids(array(
+			'forums' => array(
+				'Feeds #1.1',
+			),
+		));
+
+		// We have to wait because of the flood interval.
+		sleep(15);
+
+		$this->login('disapprove_user');
+		$post = $this->create_topic($this->data['forums']['Feeds #1.1'], 'Feeds #1.1 - Topic #3', 'This is a test topic posted by the testing framework.', array(), 'POST_STORED_MOD');
+		$this->data['topics']['Feeds #1 - Topic #3'] = (int) $post['topic_id'];
+		$crawler = self::request('GET', "viewforum.php?f={$this->data['forums']['Feeds #1.1']}&sid={$this->sid}");
+
+		$this->assertNotContains('Feeds #1.1 - Topic #3', $crawler->filter('html')->text());
+	}
+
+	public function test_feeds_unapproved_topic_admin()
+	{
+		$this->load_ids(array(
+			'forums' => array(
+				'Feeds #1.1',
+			),
+			'topics' => array(
+				'Feeds #1.1 - Topic #3',
+			),
+		));
+
+		// Assert that the unapproved topic is marked as unapproved for users that have the right to see it.
+		$this->assert_feeds(array(
+			'f' => array(
+				array(
+					'nb_entries' => 4,
+					'id' => $this->data['forums']['Feeds #1.1'],
+					'contents_lang' => array(
+						1 => 'POST_UNAPPROVED',
+					),
+				),
+			),
+			't' => array(
+				array(
+					'nb_entries' => 1,
+					'id' => $this->data['topics']['Feeds #1.1 - Topic #3'],
+					'contents_lang' => array(
+						1 => 'POST_UNAPPROVED',
+					),
+				),
+			),
+			'overall' => array(
+				array(
+					'nb_entries' => 10,
+					'contents_lang' => array(
+						1 => 'POST_UNAPPROVED',
+					),
+				),
+			),
+			'topics' => array(
+				array(
+					'nb_entries' => 7,
+					'contents_lang' => array(
+						1 => 'TOPIC_UNAPPROVED',
+					),
+				),
+			),
+			'topics_new' => array(
+				array(
+					'nb_entries' => 7,
+					'contents_lang' => array(
+						1 => 'TOPIC_UNAPPROVED',
+					),
+				),
+			),
+			'topics_active' => array(
+				array(
+					'nb_entries' => 7,
+					'contents_lang' => array(
+						1 => 'TOPIC_UNAPPROVED',
+					),
+				),
+			),
+		), 'admin');
+	}
+
+	public function test_feeds_unapproved_topic_disapprove_user()
+	{
+		$this->load_ids(array(
+			'forums' => array(
+				'Feeds #1.1',
+			),
+			'topics' => array(
+				'Feeds #1.1 - Topic #3',
+			),
+		));
+
+		$this->assert_feeds(array(
+			'f' => array(
+				array(
+					'nb_entries' => 2,
+					'id' => $this->data['forums']['Feeds #1.1'],
+				),
+			),
+			't' => array(
+				array(
+					'id' => $this->data['topics']['Feeds #1.1 - Topic #3'],
+					'contents_lang' => array('SORRY_AUTH_READ'),
+					'invalid' => true,
+				),
+			),
+			'overall' => array(
+				array(
+					'nb_entries' => 6,
+				),
+			),
+			'topics' => array(
+				array(
+					'nb_entries' => 5,
+				),
+			),
+			'topics_new' => array(
+				array(
+					'nb_entries' => 5,
+				),
+			),
+			'topics_active' => array(
+				array(
+					'nb_entries' => 5,
+				),
+			),
+		), 'disapprove_user');
+	}
+
+	public function test_create_attachment_topic()
+	{
+		$this->login();
+		$this->load_ids(array(
+			'forums' => array(
+				'Feeds #1',
+			),
+		));
+
+		// Test creating a topic with 1 attachment
+		$post = $this->create_topic($this->data['forums']['Feeds #1'], 'Feeds #1 - Topic #3', 'This is a test topic posted by the testing framework. [attachment=0]Attachment #0[/attachment]', array('upload_files' => 1));
+		$crawler = self::request('GET', "viewtopic.php?t={$post['topic_id']}&sid={$this->sid}");
+
+		$this->assertContains('Feeds #1 - Topic #3', $crawler->filter('html')->text());
+		$this->data['topics']['Feeds #1 - Topic #3'] = (int) $post['topic_id'];
+	}
+
+	public function test_feeds_attachment_admin()
+	{
+		$this->load_ids(array(
+			'forums' => array(
+				'Feeds #1',
+			),
+			'topics' => array(
+				'Feeds #1 - Topic #3',
+			),
+			'posts' => array(
+				'Feeds #1 - Topic #3',
+			),
+			'attachments' => true,
+		));
+
+		$this->assert_feeds(array(
+			'f' => array(
+				array(
+					'nb_entries' => 4,
+					'id' => $this->data['forums']['Feeds #1'],
+					'attachments' => array(
+						1 => array( // First entry
+							array( // First attachment to fetch
+								'id' => $this->data['attachments'][$this->data['posts']['Feeds #1 - Topic #3']][0],
+								'displayed' => true,
+							),
+						),
+					),
+				),
+			),
+			't' => array(
+				array(
+					'nb_entries' => 1,
+					'id' => $this->data['topics']['Feeds #1 - Topic #3'],
+					'attachments' => array(
+						1 => array( // First entry
+							array( // First attachment to fetch
+								'id' => $this->data['attachments'][$this->data['posts']['Feeds #1 - Topic #3']][0],
+								'displayed' => true,
+							),
+						),
+					),
+				),
+			),
+			'overall' => array(
+				array(
+					'nb_entries' => 11,
+					'attachments' => array(
+						1 => array( // First entry
+							array( // First attachment to fetch
+								'id' => $this->data['attachments'][$this->data['posts']['Feeds #1 - Topic #3']][0],
+								'displayed' => true,
+							),
+						),
+					),
+				),
+			),
+			'topics' => array(
+				array(
+					'nb_entries' => 8,
+					'attachments' => array(
+						1 => array( // First entry
+							array( // First attachment to fetch
+								'id' => $this->data['attachments'][$this->data['posts']['Feeds #1 - Topic #3']][0],
+								'displayed' => true,
+							),
+						),
+					),
+				),
+			),
+			'topics_new' => array(
+				array(
+					'nb_entries' => 8,
+					'attachments' => array(
+						1 => array( // First entry
+							array( // First attachment to fetch
+								'id' => $this->data['attachments'][$this->data['posts']['Feeds #1 - Topic #3']][0],
+								'displayed' => true,
+							),
+						),
+					),
+				),
+			),
+			'topics_active' => array(
+				array(
+					'nb_entries' => 8,
+					'attachments' => array(
+						1 => array( // First entry
+							array( // First attachment to fetch
+								'id' => $this->data['attachments'][$this->data['posts']['Feeds #1 - Topic #3']][0],
+								'displayed' => true,
+							),
+						),
+					),
+				),
+			),
+		), 'admin');
+	}
+
+	public function test_feeds_attachment_guest()
+	{
+		$this->load_ids(array(
+			'forums' => array(
+				'Feeds #1',
+			),
+			'topics' => array(
+				'Feeds #1 - Topic #3',
+			),
+			'posts' => array(
+				'Feeds #1 - Topic #3',
+			),
+			'attachments' => true,
+		));
+
+		$this->assert_feeds(array(
+			'f' => array(
+				array(
+					'nb_entries' => 2,
+					'id' => $this->data['forums']['Feeds #1'],
+					'attachments' => array(
+						1 => array( // First entry
+							array( // First attachment to fetch
+								'id' => $this->data['attachments'][$this->data['posts']['Feeds #1 - Topic #3']][0],
+								'displayed' => false,
+							),
+						),
+					),
+				),
+			),
+			't' => array(
+				array(
+					'nb_entries' => 1,
+					'id' => $this->data['topics']['Feeds #1 - Topic #3'],
+					'attachments' => array(
+						1 => array( // First entry
+							array( // First attachment to fetch
+								'id' => $this->data['attachments'][$this->data['posts']['Feeds #1 - Topic #3']][0],
+								'displayed' => false,
+							),
+						),
+					),
+				),
+			),
+			'overall' => array(
+				array(
+					'nb_entries' => 7,
+					'attachments' => array(
+						1 => array( // First entry
+							array( // First attachment to fetch
+								'id' => $this->data['attachments'][$this->data['posts']['Feeds #1 - Topic #3']][0],
+								'displayed' => false,
+							),
+						),
+					),
+				),
+			),
+			'topics' => array(
+				array(
+					'nb_entries' => 6,
+					'attachments' => array(
+						1 => array( // First entry
+							array( // First attachment to fetch
+								'id' => $this->data['attachments'][$this->data['posts']['Feeds #1 - Topic #3']][0],
+								'displayed' => false,
+							),
+						),
+					),
+				),
+			),
+			'topics_new' => array(
+				array(
+					'nb_entries' => 6,
+					'attachments' => array(
+						1 => array( // First entry
+							array( // First attachment to fetch
+								'id' => $this->data['attachments'][$this->data['posts']['Feeds #1 - Topic #3']][0],
+								'displayed' => false,
+							),
+						),
+					),
+				),
+			),
+			'topics_active' => array(
+				array(
+					'nb_entries' => 6,
+					'attachments' => array(
+						1 => array( // First entry
+							array( // First attachment to fetch
+								'id' => $this->data['attachments'][$this->data['posts']['Feeds #1 - Topic #3']][0],
+								'displayed' => false,
+							),
+						),
+					),
+				),
+			),
+		));
+	}
+
+	public function test_create_missing_attachment_post()
+	{
+		$this->login();
+		$this->load_ids(array(
+			'forums' => array(
+				'Feeds #1',
+			),
+			'topics' => array(
+				'Feeds #1 - Topic #3',
+			),
+		));
+
+		// Test creating a reply with 1 missing attachment
+		$post2 = $this->create_post($this->data['forums']['Feeds #1'], $this->data['topics']['Feeds #1 - Topic #3'], 'Re: Feeds #1 - Topic #3-1', 'This is a test post posted by the testing framework. [attachment=0]Attachment #0[/attachment]');
+		$crawler = self::request('GET', "viewtopic.php?t={$post2['topic_id']}&sid={$this->sid}");
+
+		$this->assertContains('Re: Feeds #1 - Topic #3-1', $crawler->filter('html')->text());
+		$this->data['posts']['Re: Feeds #1 - Topic #3-1'] = (int) $post2['post_id'];
+	}
+
+	public function test_feeds_missing_attachment_admin()
+	{
+		$this->load_ids(array(
+			'forums' => array(
+				'Feeds #1',
+			),
+			'topics' => array(
+				'Feeds #1 - Topic #3',
+			),
+			'posts' => array(
+				'Feeds #1 - Topic #3',
+			),
+		));
+
+		$this->add_lang('viewtopic');
+
+		$this->assert_feeds(array(
+			'f' => array(
+				array(
+					'nb_entries' => 5,
+					'id' => $this->data['forums']['Feeds #1'],
+					'contents' => array(
+						1 => 'Attachment #0',
+					),
+				),
+			),
+			't' => array(
+				array(
+					'nb_entries' => 2,
+					'id' => $this->data['topics']['Feeds #1 - Topic #3'],
+					'contents' => array(
+						1 => 'Attachment #0',
+					),
+				),
+			),
+			'overall' => array(
+				array(
+					'nb_entries' => 12,
+					'contents' => array(
+						1 => 'Attachment #0',
+					),
+				),
+			),
+			'topics' => array(
+				array(
+					'nb_entries' => 8,
+					'attachments' => array(
+						1 => array( // First entry
+							array( // First attachment to fetch
+								'id' => $this->data['attachments'][$this->data['posts']['Feeds #1 - Topic #3']][0],
+								'displayed' => true,
+							),
+						),
+					),
+				),
+			),
+			'topics_new' => array(
+				array(
+					'nb_entries' => 8,
+					'attachments' => array(
+						1 => array( // First entry
+							array( // First attachment to fetch
+								'id' => $this->data['attachments'][$this->data['posts']['Feeds #1 - Topic #3']][0],
+								'displayed' => true,
+							),
+						),
+					),
+				),
+			),
+			'topics_active' => array(
+				array(
+					'nb_entries' => 8,
+					'contents' => array(
+						1 => 'Attachment #0',
+					),
+				),
+			),
+		), 'admin');
+	}
+
+	protected function assert_feeds($data, $username = false)
+	{
+		if ($username)
+		{
+			$this->login($username);
+			$init_values = self::$init_values[$username];
+		}
+		else
+		{
+			$init_values = self::$init_values['disapprove_user'];
+		}
+
+		foreach ($data as $mode => $feeds)
+		{
+			foreach ($feeds as $feed_data)
+			{
+				if ($mode === 'f' || $mode === 't')
+				{
+					$params = "?{$mode}={$feed_data['id']}";
+					$this->assert_feed($params, $feed_data);
+				}
+				else
+				{
+					switch ($mode) {
+						case 'forums':
+							$feed_data['nb_entries'] = ((int)$feed_data['nb_entries'] + $init_values['forums_value']);
+							break;
+						case 'overall':
+							$feed_data['nb_entries'] = min($feed_data['nb_entries'] + $init_values['overall_value'], self::$init_values['post_base_items']);
+							break;
+						case 'topics':
+							$feed_data['nb_entries'] = min($feed_data['nb_entries'] + $init_values['topics_value'],  self::$init_values['topic_base_items']);
+							break;
+						case 'topics_new':
+							$feed_data['nb_entries'] = min($feed_data['nb_entries'] + $init_values['topics_new_value'],  self::$init_values['topic_base_items']);
+							break;
+						case 'topics_active':
+							$feed_data['nb_entries'] = min($feed_data['nb_entries'] + $init_values['topics_active_value'], self::$init_values['topic_base_items']);
+							break;
+						case 'news':
+							break;
+						default:
+							$this->fail('Unsupported feed mode: ' . $mode);
+					}
+
+					$params = "?mode={$mode}";
+					$this->assert_feed($params, $feed_data);
+				}
+			}
+		}
+	}
+
+	protected function assert_feed($params, $data)
+	{
+		$crawler = self::request('GET', 'feed.php' . $params, array(), false);
+
+		if (empty($data['invalid']))
+		{
+			self::assert_response_xml();
+			$this->assertEquals($data['nb_entries'], $crawler->filter('entry')->count(), "Tested feed : 'feed.php{$params}'");
+
+			if (!empty($data['xpath']))
+			{
+
+				foreach($data['xpath'] as $xpath => $count_expected)
+				{
+					$this->assertCount($count_expected, $crawler->filterXPath($xpath), "Tested feed : 'feed.php{$params}', Search for {$xpath}");
+				}
+			}
+
+			if (!empty($data['contents']))
+			{
+				foreach($data['contents'] as $entry_id => $string)
+				{
+					$content = $crawler->filterXPath("//entry[{$entry_id}]/content")->text();
+					$this->assertContains($string, $content, "Tested feed : 'feed.php{$params}'");
+				}
+			}
+
+			if (!empty($data['contents_lang']))
+			{
+				foreach($data['contents_lang'] as $entry_id => $string)
+				{
+					$content = $crawler->filterXPath("//entry[{$entry_id}]/content")->text();
+					$this->assertContainsLang($string, $content, "Tested feed : 'feed.php{$params}'");
+				}
+			}
+
+			if (!empty($data['attachments']))
+			{
+				foreach($data['attachments'] as $entry_id => $attachments)
+				{
+					foreach ($attachments as $i => $attachment)
+					{
+						$content = $crawler->filterXPath("//entry[{$entry_id}]/content")->text();
+						$url = "./download/file.php?id={$attachment['id']}";
+						$string = "Attachment #{$i}";
+
+						if ($attachment['displayed'])
+						{
+							$this->assertContains($url, $content, "Tested feed : 'feed.php{$params}'");
+							$this->assertNotContains($string, $content, "Tested feed : 'feed.php{$params}'");
+						}
+						else
+						{
+							$this->assertContains($string, $content, "Tested feed : 'feed.php{$params}'");
+							$this->assertNotContains($url, $content, "Tested feed : 'feed.php{$params}'");
+						}
+					}
+				}
+			}
+		}
+		else
+		{
+			self::assert_response_html();
+
+			if (!empty($data['contents_lang']))
+			{
+				foreach($data['contents_lang'] as $string)
+				{
+					$content = $crawler->filter('html')->text();
+					$this->assertContainsLang($string, $content, "Tested feed : 'feed.php{$params}'");
+				}
+			}
+		}
+	}
+
+	protected function load_ids($data)
+	{
+		$this->db = $this->get_db();
+
+		if (!empty($data['forums']))
+		{
+			$sql = 'SELECT *
+				FROM phpbb_forums
+				WHERE ' . $this->db->sql_in_set('forum_name', $data['forums']);
+			$result = $this->db->sql_query($sql);
+			while ($row = $this->db->sql_fetchrow($result))
+			{
+				if (in_array($row['forum_name'], $data['forums']))
+				{
+					$this->data['forums'][$row['forum_name']] = (int) $row['forum_id'];
+				}
+			}
+			$this->db->sql_freeresult($result);
+		}
+
+		if (!empty($data['topics']))
+		{
+			$sql = 'SELECT *
+				FROM phpbb_topics
+				WHERE ' . $this->db->sql_in_set('topic_title', $data['topics']);
+			$result = $this->db->sql_query($sql);
+			while ($row = $this->db->sql_fetchrow($result))
+			{
+				if (in_array($row['topic_title'], $data['topics']))
+				{
+					$this->data['topics'][$row['topic_title']] = (int) $row['topic_id'];
+				}
+			}
+			$this->db->sql_freeresult($result);
+		}
+
+		$post_ids = array();
+		if (!empty($data['posts']))
+		{
+			$sql = 'SELECT *
+				FROM phpbb_posts
+				WHERE ' . $this->db->sql_in_set('post_subject', $data['posts']);
+			$result = $this->db->sql_query($sql);
+			while ($row = $this->db->sql_fetchrow($result))
+			{
+				if (in_array($row['post_subject'], $data['posts']))
+				{
+					$this->data['posts'][$row['post_subject']] = (int) $row['post_id'];
+					$post_ids[] = (int) $row['post_id'];
+				}
+			}
+			$this->db->sql_freeresult($result);
+
+			if (isset($data['attachments']))
+			{
+				$sql = 'SELECT *
+					FROM phpbb_attachments
+					WHERE in_message = 0 AND ' . $this->db->sql_in_set('post_msg_id', $post_ids);
+				$result = $this->db->sql_query($sql);
+				while ($row = $this->db->sql_fetchrow($result))
+				{
+					$this->data['attachments'][(int) $row['post_msg_id']][] = (int) $row['attach_id'];
+				}
+				$this->db->sql_freeresult($result);
+			}
+		}
+	}
+}
diff --git a/tests/functional/jumpbox_test.php b/tests/functional/jumpbox_test.php
new file mode 100644
index 0000000000..b987d2b99b
--- /dev/null
+++ b/tests/functional/jumpbox_test.php
@@ -0,0 +1,33 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2014 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @group functional
+*/
+class phpbb_functional_jumpbox_test extends phpbb_functional_test_case
+{
+	public function test_jumpbox()
+	{
+		$this->login();
+
+		$crawler = self::request('GET', "viewtopic.php?t=1&sid={$this->sid}");
+		$form = $crawler->filter('#quickmodform')->selectButton($this->lang('GO'))->form(array(
+			'action'	=> 'merge_topic',
+		));
+
+		$crawler = self::submit($form);
+		$this->assertContains($this->lang('FORUM') . ': Your first forum', $crawler->filter('#cp-main h2')->text());
+		$form = $crawler->filter('#jumpbox')->selectButton($this->lang('GO'))->form(array(
+			'f'	=> 1,
+		));
+
+		$crawler = self::submit($form);
+		$this->assertContains($this->lang('FORUM') . ': Your first category', $crawler->filter('#cp-main h2')->text());
+	}
+}
diff --git a/tests/functional/ucp_allow_pm_test.php b/tests/functional/ucp_allow_pm_test.php
new file mode 100644
index 0000000000..b433ec8e75
--- /dev/null
+++ b/tests/functional/ucp_allow_pm_test.php
@@ -0,0 +1,70 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2014 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @group functional
+*/
+class phpbb_functional_ucp_allow_pm_test extends phpbb_functional_test_case
+{
+	static protected $data = array();
+
+	public function __construct()
+	{
+		parent::__construct();
+
+		$this->backupStaticAttributesBlacklist += array(
+			'phpbb_functional_ucp_allow_pm_test' => array('data'),
+		);
+	}
+
+	// user A sends a PM to user B where B accepts PM
+	public function test_enabled_pm_user_to_user()
+	{
+		// setup
+		$this->create_user('test_ucp_allow_pm_sender');
+		$this->login('test_ucp_allow_pm_sender');
+		self::$data['recipient_id'] = $this->create_user('test_ucp_allow_pm_recipient');
+		self::$data['pm_url'] = "ucp.php?i=pm&mode=compose&u=" . (int) self::$data['recipient_id'] . "&sid={$this->sid}";
+
+		// the actual test
+		$this->set_user_allow_pm(self::$data['recipient_id'], 1);
+		$crawler = self::request('GET', self::$data['pm_url']);
+		$this->assertNotContainsLang('PM_USERS_REMOVED_NO_PM', $crawler->filter('html')->text());
+	}
+
+	// user A sends a PM to user B where B does not accept PM
+	public function test_disabled_pm_user_to_user()
+	{
+		$this->login('test_ucp_allow_pm_sender');
+		$this->set_user_allow_pm(self::$data['recipient_id'], 0);
+		$crawler = self::request('GET', self::$data['pm_url']);
+		$this->assertContainsLang('PM_USERS_REMOVED_NO_PM', $crawler->filter('.error')->text());
+	}
+
+
+	// An admin sends a PM to user B where B does not accept PM, but cannot
+	// ignore a PM from an admin
+	public function test_disabled_pm_admin_to_user()
+	{
+		$this->login();
+		$crawler = self::request('GET', self::$data['pm_url']);
+		$this->assertNotContainsLang('PM_USERS_REMOVED_NO_PM', $crawler->filter('html')->text());
+	}
+
+	// enable or disable PM for a user, like from ucp
+	protected function set_user_allow_pm($user_id, $allow)
+	{
+		$db = $this->get_db();
+		$sql = 'UPDATE ' . USERS_TABLE . "
+			SET user_allow_pm = " . $allow . "
+			WHERE user_id = " . $user_id;
+		$result = $db->sql_query($sql);
+		$db->sql_freeresult($result);
+	}
+}
diff --git a/tests/functional/disapprove_test.php b/tests/functional/visibility_disapprove_test.php
index ea594b1062..ca6f6f5f37 100644
--- a/tests/functional/disapprove_test.php
+++ b/tests/functional/visibility_disapprove_test.php
@@ -10,7 +10,7 @@
 /**
 * @group functional
 */
-class phpbb_functional_disapprove_test extends phpbb_functional_test_case
+class phpbb_functional_visibility_disapprove_test extends phpbb_functional_test_case
 {
 	protected $data = array();
 
diff --git a/tests/functional/visibility_reapprove_test.php b/tests/functional/visibility_reapprove_test.php
new file mode 100644
index 0000000000..70134ef724
--- /dev/null
+++ b/tests/functional/visibility_reapprove_test.php
@@ -0,0 +1,416 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2014 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @group functional
+*/
+class phpbb_functional_visibility_reapprove_test extends phpbb_functional_test_case
+{
+	protected $data = array();
+
+	public function test_setup_forums()
+	{
+		$this->login();
+		$this->admin_login();
+
+		$crawler = self::request('GET', "adm/index.php?i=acp_forums&mode=manage&sid={$this->sid}");
+		$form = $crawler->selectButton('addforum')->form(array(
+			'forum_name'	=> 'Reapprove Test #1',
+		));
+		$crawler = self::submit($form);
+		$form = $crawler->selectButton('update')->form(array(
+			'forum_perm_from'	=> 2,
+		));
+		$crawler = self::submit($form);
+
+		// Set flood interval to 0
+		$this->set_flood_interval(0);
+	}
+
+	public function test_create_posts()
+	{
+		$this->login();
+		$this->load_ids(array(
+			'forums' => array(
+				'Reapprove Test #1',
+			),
+		));
+
+		$this->assert_forum_details($this->data['forums']['Reapprove Test #1'], array(
+			'forum_posts_approved'		=> 0,
+			'forum_posts_unapproved'	=> 0,
+			'forum_posts_softdeleted'	=> 0,
+			'forum_topics_approved'		=> 0,
+			'forum_topics_unapproved'	=> 0,
+			'forum_topics_softdeleted'	=> 0,
+			'forum_last_post_id'		=> 0,
+		), 'initial comparison');
+
+		// Test creating topic #1
+		$post = $this->create_topic($this->data['forums']['Reapprove Test #1'], 'Reapprove Test Topic #1', 'This is a test topic posted by the testing framework.');
+		$crawler = self::request('GET', "viewtopic.php?t={$post['topic_id']}&sid={$this->sid}");
+
+		$this->assertContains('Reapprove Test Topic #1', $crawler->filter('h2')->text());
+		$this->data['topics']['Reapprove Test Topic #1'] = (int) $post['topic_id'];
+		$this->data['posts']['Reapprove Test Topic #1'] = (int) $this->get_parameter_from_link($crawler->filter('.post')->selectLink($this->lang('POST', '', ''))->link()->getUri(), 'p');
+
+		$this->assert_forum_details($this->data['forums']['Reapprove Test #1'], array(
+			'forum_posts_approved'		=> 1,
+			'forum_posts_unapproved'	=> 0,
+			'forum_posts_softdeleted'	=> 0,
+			'forum_topics_approved'		=> 1,
+			'forum_topics_unapproved'	=> 0,
+			'forum_topics_softdeleted'	=> 0,
+			'forum_last_post_id'		=> $this->data['posts']['Reapprove Test Topic #1'],
+		), 'after creating topic #1');
+
+		$this->logout();
+		$this->create_user('reapprove_testuser');
+		$this->add_user_group('NEWLY_REGISTERED', array('reapprove_testuser'));
+		$this->login('reapprove_testuser');
+
+		// Test creating a reply
+		$post2 = $this->create_post($this->data['forums']['Reapprove Test #1'], $post['topic_id'], 'Re: Reapprove Test Topic #1-#2', 'This is a test post posted by the testing framework.', array(), 'POST_STORED_MOD');
+
+		$crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Reapprove Test Topic #1']}&sid={$this->sid}");
+		$this->assertNotContains('Re: Reapprove Test Topic #1-#2', $crawler->filter('#page-body')->text());
+
+		$this->assert_forum_details($this->data['forums']['Reapprove Test #1'], array(
+			'forum_posts_approved'		=> 1,
+			'forum_posts_unapproved'	=> 1,
+			'forum_posts_softdeleted'	=> 0,
+			'forum_topics_approved'		=> 1,
+			'forum_topics_unapproved'	=> 0,
+			'forum_topics_softdeleted'	=> 0,
+			'forum_last_post_id'		=> $this->data['posts']['Reapprove Test Topic #1'],
+		), 'after replying');
+
+		// Test creating topic #2
+		$post = $this->create_topic($this->data['forums']['Reapprove Test #1'], 'Reapprove Test Topic #2', 'This is a test topic posted by the testing framework.', array(), 'POST_STORED_MOD');
+		$crawler = self::request('GET', "viewforum.php?f={$this->data['forums']['Reapprove Test #1']}&sid={$this->sid}");
+
+		$this->assertNotContains('Reapprove Test Topic #2', $crawler->filter('html')->text());
+
+		$this->assert_forum_details($this->data['forums']['Reapprove Test #1'], array(
+			'forum_posts_approved'		=> 1,
+			'forum_posts_unapproved'	=> 2,
+			'forum_posts_softdeleted'	=> 0,
+			'forum_topics_approved'		=> 1,
+			'forum_topics_unapproved'	=> 1,
+			'forum_topics_softdeleted'	=> 0,
+			'forum_last_post_id'		=> $this->data['posts']['Reapprove Test Topic #1'],
+		), 'after creating topic #2');
+
+		$this->logout();
+	}
+
+	public function test_approve_post()
+	{
+		$this->login();
+		$this->load_ids(array(
+			'forums' => array(
+				'Reapprove Test #1',
+			),
+			'topics' => array(
+				'Reapprove Test Topic #1',
+				'Reapprove Test Topic #2',
+			),
+			'posts' => array(
+				'Reapprove Test Topic #1',
+				'Re: Reapprove Test Topic #1-#2',
+				'Reapprove Test Topic #2',
+			),
+		));
+
+		$this->assert_forum_details($this->data['forums']['Reapprove Test #1'], array(
+			'forum_posts_approved'		=> 1,
+			'forum_posts_unapproved'	=> 2,
+			'forum_posts_softdeleted'	=> 0,
+			'forum_topics_approved'		=> 1,
+			'forum_topics_unapproved'	=> 1,
+			'forum_topics_softdeleted'	=> 0,
+			'forum_last_post_id'		=> $this->data['posts']['Reapprove Test Topic #1'],
+		), 'before approving post');
+
+		$this->add_lang('posting');
+		$this->add_lang('viewtopic');
+		$this->add_lang('mcp');
+		$crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Reapprove Test Topic #1']}&sid={$this->sid}");
+		$this->assertContains('Reapprove Test Topic #1', $crawler->filter('h2')->text());
+		$this->assertContains('Re: Reapprove Test Topic #1-#2', $crawler->filter('#page-body')->text());
+
+		$form = $crawler->selectButton($this->lang('APPROVE'))->form();
+		$crawler = self::submit($form);
+		$form = $crawler->selectButton($this->lang('YES'))->form();
+		$crawler = self::submit($form);
+		$this->assertContainsLang('POST_APPROVED_SUCCESS', $crawler->text());
+
+		$this->assert_forum_details($this->data['forums']['Reapprove Test #1'], array(
+			'forum_posts_approved'		=> 2,
+			'forum_posts_unapproved'	=> 1,
+			'forum_posts_softdeleted'	=> 0,
+			'forum_topics_approved'		=> 1,
+			'forum_topics_unapproved'	=> 1,
+			'forum_topics_softdeleted'	=> 0,
+			'forum_last_post_id'		=> $this->data['posts']['Re: Reapprove Test Topic #1-#2'],
+		), 'after approving post');
+
+		$link = $crawler->selectLink($this->lang('RETURN_PAGE', '', ''))->link();
+		$link_url = $link->getUri();
+		$this->assertContains('viewtopic.php?f=' . $this->data['forums']['Reapprove Test #1'] . '&t=' . $this->data['topics']['Reapprove Test Topic #1'], $link_url);
+
+		$crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Reapprove Test Topic #1']}&sid={$this->sid}");
+		$this->assertContains('Reapprove Test Topic #1', $crawler->filter('h2')->text());
+		$this->assertContains('Re: Reapprove Test Topic #1-#2', $crawler->filter('#page-body')->text());
+	}
+
+	public function test_approve_topic()
+	{
+		$this->login();
+		$this->load_ids(array(
+			'forums' => array(
+				'Reapprove Test #1',
+			),
+			'topics' => array(
+				'Reapprove Test Topic #1',
+				'Reapprove Test Topic #2',
+			),
+			'posts' => array(
+				'Reapprove Test Topic #1',
+				'Re: Reapprove Test Topic #1-#2',
+				'Reapprove Test Topic #2',
+			),
+		));
+
+		$this->assert_forum_details($this->data['forums']['Reapprove Test #1'], array(
+			'forum_posts_approved'		=> 2,
+			'forum_posts_unapproved'	=> 1,
+			'forum_posts_softdeleted'	=> 0,
+			'forum_topics_approved'		=> 1,
+			'forum_topics_unapproved'	=> 1,
+			'forum_topics_softdeleted'	=> 0,
+			'forum_last_post_id'		=> $this->data['posts']['Re: Reapprove Test Topic #1-#2'],
+		), 'before approving topic');
+
+		$this->add_lang('posting');
+		$this->add_lang('viewtopic');
+		$this->add_lang('mcp');
+		$crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Reapprove Test Topic #2']}&sid={$this->sid}");
+		$this->assertContains('Reapprove Test Topic #2', $crawler->filter('h2')->text());
+
+		$form = $crawler->selectButton($this->lang('APPROVE'))->form();
+		$crawler = self::submit($form);
+		$form = $crawler->selectButton($this->lang('YES'))->form();
+		$crawler = self::submit($form);
+		//@todo $this->assertContainsLang('TOPIC_APPROVED_SUCCESS', $crawler->text());
+		$this->assertContainsLang('POST_APPROVED_SUCCESS', $crawler->text());
+
+		$this->assert_forum_details($this->data['forums']['Reapprove Test #1'], array(
+			'forum_posts_approved'		=> 3,
+			'forum_posts_unapproved'	=> 0,
+			'forum_posts_softdeleted'	=> 0,
+			'forum_topics_approved'		=> 2,
+			'forum_topics_unapproved'	=> 0,
+			'forum_topics_softdeleted'	=> 0,
+			'forum_last_post_id'		=> $this->data['posts']['Reapprove Test Topic #2'],
+		), 'after approving topic');
+
+		$link = $crawler->selectLink($this->lang('RETURN_PAGE', '', ''))->link();
+		$link_url = $link->getUri();
+		$this->assertContains('viewtopic.php?f=' . $this->data['topic']['Reapprove Test Topic #2'], $link_url);
+
+		$crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Reapprove Test Topic #2']}&sid={$this->sid}");
+		$this->assertContains('Reapprove Test Topic #2', $crawler->filter('h2')->text());
+	}
+
+	public function test_edit_posts()
+	{
+		$this->load_ids(array(
+			'forums' => array(
+				'Reapprove Test #1',
+			),
+			'topics' => array(
+				'Reapprove Test Topic #1',
+				'Reapprove Test Topic #2',
+			),
+			'posts' => array(
+				'Reapprove Test Topic #1',
+				'Re: Reapprove Test Topic #1-#2',
+				'Reapprove Test Topic #2',
+			),
+		));
+		$this->add_lang('posting');
+
+		$this->assert_forum_details($this->data['forums']['Reapprove Test #1'], array(
+			'forum_posts_approved'		=> 3,
+			'forum_posts_unapproved'	=> 0,
+			'forum_posts_softdeleted'	=> 0,
+			'forum_topics_approved'		=> 2,
+			'forum_topics_unapproved'	=> 0,
+			'forum_topics_softdeleted'	=> 0,
+			'forum_last_post_id'		=> $this->data['posts']['Reapprove Test Topic #2'],
+		), 'before editing post');
+
+		$this->login('reapprove_testuser');
+		$this->add_user_group('NEWLY_REGISTERED', array('reapprove_testuser'));
+
+		// Test editing a post
+		$posting_url = "posting.php?mode=edit&f={$this->data['forums']['Reapprove Test #1']}&p={$this->data['posts']['Re: Reapprove Test Topic #1-#2']}&sid={$this->sid}";
+		$form_data = array(
+			'message'	=> 'Post edited by testing framework',
+			'subject'	=> 'Re: Reapprove Test Topic #1-#2',
+			'post'		=> true,
+		);
+		$this->submit_post($posting_url, 'EDIT_POST', $form_data, 'POST_EDITED_MOD');
+
+		$crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Reapprove Test Topic #1']}&sid={$this->sid}");
+		$this->assertNotContains('Re: Reapprove Test Topic #1-#2', $crawler->filter('#page-body')->text());
+		$this->assertNotContains('Post edited by testing framework', $crawler->filter('#page-body')->text());
+
+		$this->assert_forum_details($this->data['forums']['Reapprove Test #1'], array(
+			'forum_posts_approved'		=> 2,
+			'forum_posts_unapproved'	=> 1,
+			'forum_posts_softdeleted'	=> 0,
+			'forum_topics_approved'		=> 2,
+			'forum_topics_unapproved'	=> 0,
+			'forum_topics_softdeleted'	=> 0,
+			'forum_last_post_id'		=> $this->data['posts']['Reapprove Test Topic #2'],
+		), 'after editing post');
+
+		// Test editing a topic
+		$posting_url = "posting.php?mode=edit&f={$this->data['forums']['Reapprove Test #1']}&p={$this->data['posts']['Reapprove Test Topic #2']}&sid={$this->sid}";
+		$form_data = array(
+			'message'	=> 'Post edited by testing framework',
+			'subject'	=> 'Reapprove Test Topic #2',
+			'post'		=> true,
+		);
+		$this->submit_post($posting_url, 'EDIT_POST', $form_data, 'POST_EDITED_MOD');
+
+		$crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Reapprove Test Topic #2']}&sid={$this->sid}", array(), false);
+		self::assert_response_html(404);
+		$this->assertNotContains('Reapprove Test Topic #2', $crawler->filter('#page-body')->text());
+		$this->assertNotContains('Post edited by testing framework', $crawler->filter('#page-body')->text());
+
+		$this->assert_forum_details($this->data['forums']['Reapprove Test #1'], array(
+			'forum_posts_approved'		=> 1,
+			'forum_posts_unapproved'	=> 2,
+			'forum_posts_softdeleted'	=> 0,
+			'forum_topics_approved'		=> 1,
+			'forum_topics_unapproved'	=> 1,
+			'forum_topics_softdeleted'	=> 0,
+			'forum_last_post_id'		=> $this->data['posts']['Reapprove Test Topic #1'],
+		), 'after editing topic');
+
+		$this->logout();
+		$this->login();
+
+		$crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Reapprove Test Topic #1']}&sid={$this->sid}");
+		$this->assertContains('Re: Reapprove Test Topic #1-#2', $crawler->filter('#page-body')->text());
+		$this->assertContains('Post edited by testing framework', $crawler->filter('#page-body')->text());
+	}
+
+	public function test_approve_post_again()
+	{
+		$this->test_approve_post();
+	}
+
+	public function test_approve_topic_again()
+	{
+		$this->test_approve_topic();
+	}
+
+	public function test_reset_flood_interval()
+	{
+		$this->login();
+		$this->admin_login();
+
+		// Set flood interval back to 15
+		$this->set_flood_interval(15);
+	}
+
+	protected function assert_forum_details($forum_id, $details, $additional_error_message = '')
+	{
+		$this->db = $this->get_db();
+
+		$sql = 'SELECT ' . implode(', ', array_keys($details)) . '
+			FROM phpbb_forums
+			WHERE forum_id = ' . (int) $forum_id;
+		$result = $this->db->sql_query($sql);
+		$data = $this->db->sql_fetchrow($result);
+		$this->db->sql_freeresult($result);
+
+		$this->assertEquals($details, $data, "Forum {$forum_id} does not match expected {$additional_error_message}");
+	}
+
+	protected function set_flood_interval($flood_interval)
+	{
+		$crawler = self::request('GET', 'adm/index.php?sid=' . $this->sid . '&i=acp_board&mode=post');
+
+		$form = $crawler->selectButton('Submit')->form();
+		$values = $form->getValues();
+
+		$values["config[flood_interval]"] = $flood_interval;
+		$form->setValues($values);
+		$crawler = self::submit($form);
+		$this->assertGreaterThan(0, $crawler->filter('.successbox')->count());
+	}
+
+	protected function load_ids($data)
+	{
+		$this->db = $this->get_db();
+
+		if (!empty($data['forums']))
+		{
+			$sql = 'SELECT *
+				FROM phpbb_forums
+				WHERE ' . $this->db->sql_in_set('forum_name', $data['forums']);
+			$result = $this->db->sql_query($sql);
+			while ($row = $this->db->sql_fetchrow($result))
+			{
+				if (in_array($row['forum_name'], $data['forums']))
+				{
+					$this->data['forums'][$row['forum_name']] = (int) $row['forum_id'];
+				}
+			}
+			$this->db->sql_freeresult($result);
+		}
+
+		if (!empty($data['topics']))
+		{
+			$sql = 'SELECT *
+				FROM phpbb_topics
+				WHERE ' . $this->db->sql_in_set('topic_title', $data['topics']);
+			$result = $this->db->sql_query($sql);
+			while ($row = $this->db->sql_fetchrow($result))
+			{
+				if (in_array($row['topic_title'], $data['topics']))
+				{
+					$this->data['topics'][$row['topic_title']] = (int) $row['topic_id'];
+				}
+			}
+			$this->db->sql_freeresult($result);
+		}
+
+		if (!empty($data['posts']))
+		{
+			$sql = 'SELECT *
+				FROM phpbb_posts
+				WHERE ' . $this->db->sql_in_set('post_subject', $data['posts']);
+			$result = $this->db->sql_query($sql);
+			while ($row = $this->db->sql_fetchrow($result))
+			{
+				if (in_array($row['post_subject'], $data['posts']))
+				{
+					$this->data['posts'][$row['post_subject']] = (int) $row['post_id'];
+				}
+			}
+			$this->db->sql_freeresult($result);
+		}
+	}
+}
diff --git a/tests/functional/softdelete_test.php b/tests/functional/visibility_softdelete_test.php
index 1c86d00b9b..3d44476ff0 100644
--- a/tests/functional/softdelete_test.php
+++ b/tests/functional/visibility_softdelete_test.php
@@ -10,7 +10,7 @@
 /**
 * @group functional
 */
-class phpbb_functional_softdelete_test extends phpbb_functional_test_case
+class phpbb_functional_visibility_softdelete_test extends phpbb_functional_test_case
 {
 	protected $data = array();
 
@@ -608,7 +608,7 @@ class phpbb_functional_softdelete_test extends phpbb_functional_test_case
 
 		$crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Soft Delete Topic #1']}&sid={$this->sid}");
 		$this->assertContains('Soft Delete Topic #1', $crawler->filter('h2')->text());
-		$this->assertContainsLang('POST_DELETED', $crawler->filter('body')->text());
+		$this->assertContainsLang('POST_DELETED_ACTION', $crawler->filter('body')->text());
 
 		$this->assert_forum_details($this->data['forums']['Soft Delete #1'], array(
 			'forum_posts_approved'		=> 1,