From 0a707dd1ceec36b53ea45889b27051ed8a9a4e4b Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 12 May 2013 11:35:46 +0200
Subject: [ticket/11531] Add basic set of functional tests for new avatar
 system

This currently includes tests for the gravatar, remote avatar, and upload
avatar drivers. The local avatar driver is currently not supported. Two
tests currently fail and have been marked as incomplete. One failure is
due to an issue with Symfony's DomCrawler that exists in Symfony < 2.2.
The other one is caused by a bug in the way remote avatars are treated.
According to my tests, this bug also exists in phpBB 3.0.11 and has been
reported in the tracker: http://tracker.phpbb.com/browse/PHPBB3-11534

PHPBB3-11531
---
 tests/functional/avatar_test.php | 210 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 210 insertions(+)
 create mode 100644 tests/functional/avatar_test.php

diff --git a/tests/functional/avatar_test.php b/tests/functional/avatar_test.php
new file mode 100644
index 0000000000..b6dcc16e8a
--- /dev/null
+++ b/tests/functional/avatar_test.php
@@ -0,0 +1,210 @@
+<?php
+/**
+ *
+ * @package testing
+ * @copyright (c) 2013 phpBB Group
+ * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+ *
+ */
+
+/**
+ * @group functional
+ */
+class phpbb_functional_avatar_test extends phpbb_functional_test_case
+{
+	private $path;
+	private $form_content;
+
+	public function setUp()
+	{
+		parent::setUp();
+		$this->path = __DIR__ . '/fixtures/files/';
+		$this->login();
+		$this->admin_login();
+		$this->add_lang(array('acp/board', 'ucp'));
+	}
+
+	public function test_acp_settings()
+	{
+		$crawler = $this->request('GET', 'adm/index.php?i=acp_board&mode=avatar&sid=' . $this->sid);
+		$this->assert_response_success();
+		// Check the default entries we should have
+		$this->assertContains($this->lang('ALLOW_GRAVATAR'), $crawler->text());
+		$this->assertContains($this->lang('ALLOW_REMOTE'), $crawler->text());
+		$this->assertContains($this->lang('ALLOW_AVATARS'), $crawler->text());
+		$this->assertContains($this->lang('ALLOW_LOCAL'), $crawler->text());
+
+		// Now start setting the needed settings
+		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
+		$form['config[allow_avatar_local]']->select(1);
+		$form['config[allow_avatar_gravatar]']->select(1);
+		$form['config[allow_avatar_remote]']->select(1);
+		$form['config[allow_avatar_remote_upload]']->select(1);
+		$crawler = $this->client->submit($form);
+		$this->assertContains($this->lang('CONFIG_UPDATED'), $crawler->text());
+	}
+
+	public function test_gravatar_avatar()
+	{
+		// Get ACP settings
+		$crawler = $this->request('GET', 'adm/index.php?i=acp_board&mode=avatar&sid=' . $this->sid);
+		$this->assert_response_success();
+		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
+		$this->form_content = $form->getValues();
+
+		// Check if required form elements exist
+		$crawler = $this->request('GET', 'ucp.php?i=ucp_profile&mode=avatar&sid=' . $this->sid);
+		$this->assert_response_success();
+		$this->assertContains($this->lang('AVATAR_TYPE'), $crawler->text());
+		$this->assertContains($this->lang('AVATAR_DRIVER_GRAVATAR_TITLE'), $crawler->filter('#avatar_driver')->text());
+		$this->assertContains($this->lang('GRAVATAR_AVATAR_EMAIL'), $crawler->text());
+
+		// Submit gravatar with correct email and correct size
+		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
+		$form['avatar_driver']->select('avatar_driver_gravatar');
+		$form['avatar_gravatar_email']->setValue('test@example.com');
+		$form['avatar_gravatar_width']->setValue(80);
+		$form['avatar_gravatar_height']->setValue(80);
+		$crawler = $this->client->submit($form);
+		$this->assertContains($this->lang('PROFILE_UPDATED'), $crawler->text());
+
+		// Submit gravatar with correct mail but incorrect size
+		$crawler = $this->request('GET', 'ucp.php?i=ucp_profile&mode=avatar&sid=' . $this->sid);
+		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
+		$form['avatar_driver']->select('avatar_driver_gravatar');
+		$form['avatar_gravatar_email']->setValue('test@example.com');
+		$form['avatar_gravatar_width']->setValue(120);
+		$form['avatar_gravatar_height']->setValue(120);
+		$crawler = $this->client->submit($form);
+		$this->assertContains(sprintf($this->lang['AVATAR_WRONG_SIZE'],
+			$this->form_content['config[avatar_min_width]'],
+			$this->form_content['config[avatar_min_height]'],
+			$this->form_content['config[avatar_max_width]'],
+			$this->form_content['config[avatar_max_height]'],
+			'120',
+			'120'
+		), $crawler->text());
+
+		// Submit gravatar with incorrect email and correct size
+		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
+		$form['avatar_driver']->select('avatar_driver_gravatar');
+		$form['avatar_gravatar_email']->setValue('test.example.com');
+		$form['avatar_gravatar_width']->setValue(80);
+		$form['avatar_gravatar_height']->setValue(80);
+		$crawler = $this->client->submit($form);
+		$this->assertContains($this->lang('EMAIL_INVALID_EMAIL'), $crawler->text());
+	}
+
+	public function test_upload_avatar()
+	{
+		// Check if required form elements exist
+		$crawler = $this->request('GET', 'ucp.php?i=ucp_profile&mode=avatar&sid=' . $this->sid);
+		$this->assert_response_success();
+		$this->assertContains($this->lang('AVATAR_DRIVER_UPLOAD_TITLE'), $crawler->filter('#avatar_driver')->text());
+		$this->assertContains($this->lang('UPLOAD_AVATAR_FILE'), $crawler->text());
+		$this->assertContains($this->lang('UPLOAD_AVATAR_URL'), $crawler->text());
+
+		// Upload remote avatar with correct size and correct link
+		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
+		$form['avatar_driver']->select('avatar_driver_upload');
+		// use default gravatar supplied by test@example.com and default size = 80px
+		$form['avatar_upload_url']->setValue('https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg');
+		$crawler = $this->client->submit($form);
+		$this->assertContains($this->lang('PROFILE_UPDATED'), $crawler->text());
+
+		// This will fail as the upload avatar currently expects a file that ends with an extension, e.g. .jpg
+		$crawler = $this->request('GET', 'ucp.php?i=ucp_profile&mode=avatar&sid=' . $this->sid);
+		$this->assert_response_success();
+		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
+		$form['avatar_driver']->select('avatar_driver_upload');
+		// use default gravatar supplied by test@example.com and size (s) = 80px
+		$form['avatar_upload_url']->setValue('https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0?s=80');
+		$crawler = $this->client->submit($form);
+		$this->assertContains($this->lang('AVATAR_URL_INVALID'), $crawler->text());
+
+		// Submit gravatar with correct email and correct size
+		$crawler = $this->request('GET', 'ucp.php?i=ucp_profile&mode=avatar&sid=' . $this->sid);
+		$this->assert_response_success();
+		$this->markTestIncomplete('Test fails due to bug in DomCrawler with Symfony < 2.2: https://github.com/symfony/symfony/issues/4674.');
+		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
+		$form['avatar_driver']->select('avatar_driver_upload');
+		$form['avatar_upload_file']->setValue($this->path . 'valid.jpg');
+		$crawler = $this->client->submit($form);
+		$this->assertContains($this->lang('PROFILE_UPDATED'), $crawler->text());
+	}
+
+	public function test_remote_avatar()
+	{
+		// Get ACP settings
+		$crawler = $this->request('GET', 'adm/index.php?i=acp_board&mode=avatar&sid=' . $this->sid);
+		$this->assert_response_success();
+		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
+		$this->form_content = $form->getValues();
+
+		// Check if required form elements exist
+		$crawler = $this->request('GET', 'ucp.php?i=ucp_profile&mode=avatar&sid=' . $this->sid);
+		$this->assert_response_success();
+		$this->assertContains($this->lang('AVATAR_DRIVER_REMOTE_TITLE'), $crawler->filter('#avatar_driver')->text());
+		$this->assertContains($this->lang('LINK_REMOTE_AVATAR'), $crawler->text());
+		$this->assertContains($this->lang('LINK_REMOTE_SIZE'), $crawler->text());
+
+		// Set remote avatar with correct size and correct link
+		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
+		$form['avatar_driver']->select('avatar_driver_remote');
+		// use default gravatar supplied by test@example.com and default size = 80px
+		$form['avatar_remote_url']->setValue('https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg');
+		$form['avatar_remote_width']->setValue(80);
+		$form['avatar_remote_height']->setValue(80);
+		$crawler = $this->client->submit($form);
+		$this->assertContains($this->lang('PROFILE_UPDATED'), $crawler->text());
+
+		// Set remote avatar with incorrect size
+		$crawler = $this->request('GET', 'ucp.php?i=ucp_profile&mode=avatar&sid=' . $this->sid);
+		$this->assert_response_success();
+		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
+		$form['avatar_driver']->select('avatar_driver_remote');
+		// use default gravatar supplied by test@example.com and size (s) = 80px
+		$form['avatar_remote_url']->setValue('https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg');
+		$form['avatar_remote_width']->setValue(120);
+		$form['avatar_remote_height']->setValue(120);
+		$crawler = $this->client->submit($form);
+		$this->assertContains(sprintf($this->lang['AVATAR_WRONG_SIZE'],
+			$this->form_content['config[avatar_min_width]'],
+			$this->form_content['config[avatar_min_height]'],
+			$this->form_content['config[avatar_max_width]'],
+			$this->form_content['config[avatar_max_height]'],
+			'120',
+			'120'
+		), $crawler->text());
+
+		// Enter correct data in form entries but select incorrect avatar driver
+		$crawler = $this->request('GET', 'ucp.php?i=ucp_profile&mode=avatar&sid=' . $this->sid);
+		$this->assert_response_success();
+		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
+		$form['avatar_driver']->select('avatar_driver_upload');
+		// use default gravatar supplied by test@example.com and size (s) = 80px
+		$form['avatar_remote_url']->setValue('https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg');
+		$form['avatar_remote_width']->setValue(80);
+		$form['avatar_remote_height']->setValue(80);
+		$crawler = $this->client->submit($form);
+		$this->assertContains($this->lang('NO_AVATAR_SELECTED'), $crawler->text());
+
+		/*
+		 * Enter incorrect link to a remote avatar_driver
+		 * Due to the fact that this link to phpbb.com will not serve a 404 error but rather a 404 page,
+		 * the remote avatar will think that this is a properly working avatar. This Bug also exists in
+		 * the current phpBB 3.0.11 release.
+		 */
+		$crawler = $this->request('GET', 'ucp.php?i=ucp_profile&mode=avatar&sid=' . $this->sid);
+		$this->assert_response_success();
+		$this->markTestIncomplete('Test currently fails because the remote avatar does not seem to check if it is an image');
+		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
+		$form['avatar_driver']->select('avatar_driver_remote');
+		// use random incorrect link to phpBB.com
+		$form['avatar_remote_url']->setValue('https://www.phpbb.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg');
+		$form['avatar_remote_width']->setValue(80);
+		$form['avatar_remote_height']->setValue(80);
+		$crawler = $this->client->submit($form);
+		$this->assertContains($this->lang('NO_AVATAR_SELECTED'), $crawler->text());
+	}
+}
-- 
cgit v1.2.1


From 9c4d8b3193ca853d67c0098e1627db17f7dd0311 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Mon, 13 May 2013 11:57:41 +0200
Subject: [ticket/11531] Add acp and ucp groups functional tests for avatars

The test for the acp and ucp groups settings are currently marked as
incomplete due to a bug that causes the settings to not show an error
when incorrect data is entered. However, the avatar data is not saved.
That means that even though the error treatment seems to correctly work,
the user is never informed of the issues with the submitted avatar data.

PHPBB3-11531
---
 tests/functional/avatar_acp_test.php | 147 +++++++++++++++++++++++++++++++++++
 tests/functional/avatar_test.php     |  46 ++++++++++-
 2 files changed, 192 insertions(+), 1 deletion(-)
 create mode 100644 tests/functional/avatar_acp_test.php

diff --git a/tests/functional/avatar_acp_test.php b/tests/functional/avatar_acp_test.php
new file mode 100644
index 0000000000..b359212be2
--- /dev/null
+++ b/tests/functional/avatar_acp_test.php
@@ -0,0 +1,147 @@
+<?php
+/**
+ *
+ * @package testing
+ * @copyright (c) 2013 phpBB Group
+ * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+ *
+ */
+
+/**
+ * @group functional
+ */
+class phpbb_functional_avatar_acp_test extends phpbb_functional_test_case
+{
+	private $path;
+	private $form_content;
+
+	public function setUp()
+	{
+		parent::setUp();
+		$this->path = __DIR__ . '/fixtures/files/';
+		$this->login();
+		$this->admin_login();
+		$this->add_lang(array('acp/board', 'ucp', 'acp/users', 'acp/groups'));
+	}
+
+	public function test_acp_settings()
+	{
+		$crawler = $this->request('GET', 'adm/index.php?i=acp_board&mode=avatar&sid=' . $this->sid);
+		$this->assert_response_success();
+		// Check the default entries we should have
+		$this->assertContains($this->lang('ALLOW_GRAVATAR'), $crawler->text());
+		$this->assertContains($this->lang('ALLOW_REMOTE'), $crawler->text());
+		$this->assertContains($this->lang('ALLOW_AVATARS'), $crawler->text());
+		$this->assertContains($this->lang('ALLOW_LOCAL'), $crawler->text());
+
+		// Now start setting the needed settings
+		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
+		$form['config[allow_avatar_local]']->select(1);
+		$form['config[allow_avatar_gravatar]']->select(1);
+		$form['config[allow_avatar_remote]']->select(1);
+		$form['config[allow_avatar_remote_upload]']->select(1);
+		$crawler = $this->client->submit($form);
+		$this->assertContains($this->lang('CONFIG_UPDATED'), $crawler->text());
+	}
+
+	public function test_user_acp_settings()
+	{
+		$crawler = $this->request('GET', 'adm/index.php?i=users&u=2&sid=' . $this->sid);
+		$this->assert_response_success();
+
+		// Select "Avatar" in the drop-down menu
+		$form = $crawler->selectButton($this->lang('GO'))->form();
+		$form['mode']->select('avatar');
+		$crawler = $this->client->submit($form);
+		$this->assertContains($this->lang('AVATAR_TYPE'), $crawler->text());
+
+		// Test if setting a gravatar avatar properly works
+		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
+		$form['avatar_driver']->select('avatar_driver_gravatar');
+		$form['avatar_gravatar_email']->setValue('test@example.com');
+		$form['avatar_gravatar_width']->setValue(80);
+		$form['avatar_gravatar_height']->setValue(80);
+		$crawler = $this->client->submit($form);
+		$this->assertContains($this->lang('USER_AVATAR_UPDATED'), $crawler->text());
+
+		// Go back to previous page
+		$crawler = $this->request('GET', 'adm/index.php?i=users&u=2&sid=' . $this->sid);
+		$this->assert_response_success();
+
+		// Select "Avatar" in the drop-down menu
+		$form = $crawler->selectButton($this->lang('GO'))->form();
+		$form['mode']->select('avatar');
+		$crawler = $this->client->submit($form);
+		$this->assertContains($this->lang('AVATAR_TYPE'), $crawler->text());
+
+		// Test uploading a remote avatar
+		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
+		$form['avatar_driver']->select('avatar_driver_upload');
+		// use default gravatar supplied by test@example.com and default size = 80px
+		$form['avatar_upload_url']->setValue('https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg');
+		$crawler = $this->client->submit($form);
+		$this->assertContains($this->lang('USER_AVATAR_UPDATED'), $crawler->text());
+
+		// Go back to previous page
+		$crawler = $this->request('GET', 'adm/index.php?i=users&u=2&sid=' . $this->sid);
+		$this->assert_response_success();
+
+		// Select "Avatar" in the drop-down menu
+		$form = $crawler->selectButton($this->lang('GO'))->form();
+		$form['mode']->select('avatar');
+		$crawler = $this->client->submit($form);
+		$this->assertContains($this->lang('AVATAR_TYPE'), $crawler->text());
+
+		// Submit gravatar with incorrect email and correct size
+		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
+		$form['avatar_driver']->select('avatar_driver_gravatar');
+		$form['avatar_gravatar_email']->setValue('test.example.com');
+		$form['avatar_gravatar_width']->setValue(80);
+		$form['avatar_gravatar_height']->setValue(80);
+		$crawler = $this->client->submit($form);
+		$this->assertContains($this->lang('EMAIL_INVALID_EMAIL'), $crawler->text());
+	}
+
+	public function test_group_acp_settings()
+	{
+		// Test setting group avatar of admin group
+		$crawler = $this->request('GET', 'adm/index.php?i=acp_groups&mode=manage&action=edit&g=5&sid=' . $this->sid);
+		$this->assert_response_success();
+		$this->assertContains($this->lang('AVATAR_TYPE'), $crawler->text());
+
+		// Test if setting a gravatar avatar properly works
+		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
+		$form['avatar_driver']->select('avatar_driver_gravatar');
+		$form['avatar_gravatar_email']->setValue('test@example.com');
+		$form['avatar_gravatar_width']->setValue(80);
+		$form['avatar_gravatar_height']->setValue(80);
+		$crawler = $this->client->submit($form);
+		$this->assertContains($this->lang('GROUP_UPDATED'), $crawler->text());
+
+		// Go back to previous page
+		$crawler = $this->request('GET', 'adm/index.php?i=acp_groups&mode=manage&action=edit&g=5&sid=' . $this->sid);
+		$this->assert_response_success();
+
+		// Test uploading a remote avatar
+		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
+		$form['avatar_driver']->select('avatar_driver_upload');
+		// use default gravatar supplied by test@example.com and default size = 80px
+		$form['avatar_upload_url']->setValue('https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg');
+		$crawler = $this->client->submit($form);
+		$this->assertContains($this->lang('GROUP_UPDATED'), $crawler->text());
+
+		// Go back to previous page
+		$crawler = $this->request('GET', 'adm/index.php?i=acp_groups&mode=manage&action=edit&g=5&sid=' . $this->sid);
+		$this->assert_response_success();
+
+		// Submit gravatar with incorrect email and correct size
+		$this->markTestIncomplete('No error when submitting incorrect acp group settings. This needs to be fixed ASAP.');
+		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
+		$form['avatar_driver']->select('avatar_driver_gravatar');
+		$form['avatar_gravatar_email']->setValue('test.example.com');
+		$form['avatar_gravatar_width']->setValue(80);
+		$form['avatar_gravatar_height']->setValue(80);
+		$crawler = $this->client->submit($form);
+		$this->assertContains($this->lang('EMAIL_INVALID_EMAIL'), $crawler->text());
+	}
+}
diff --git a/tests/functional/avatar_test.php b/tests/functional/avatar_test.php
index b6dcc16e8a..a29fb5ddb9 100644
--- a/tests/functional/avatar_test.php
+++ b/tests/functional/avatar_test.php
@@ -21,7 +21,7 @@ class phpbb_functional_avatar_test extends phpbb_functional_test_case
 		$this->path = __DIR__ . '/fixtures/files/';
 		$this->login();
 		$this->admin_login();
-		$this->add_lang(array('acp/board', 'ucp'));
+		$this->add_lang(array('acp/board', 'ucp', 'acp/groups'));
 	}
 
 	public function test_acp_settings()
@@ -207,4 +207,48 @@ class phpbb_functional_avatar_test extends phpbb_functional_test_case
 		$crawler = $this->client->submit($form);
 		$this->assertContains($this->lang('NO_AVATAR_SELECTED'), $crawler->text());
 	}
+
+
+	public function test_group_ucp_settings()
+	{
+		// Test setting group avatar of admin group
+		$crawler = $this->request('GET', 'ucp.php?i=ucp_groups&mode=manage&action=edit&g=5&sid=' . $this->sid);
+		$this->assert_response_success();
+		$this->assertContains($this->lang('AVATAR_TYPE'), $crawler->text());
+
+		// Test if setting a gravatar avatar properly works
+		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
+		$form['avatar_driver']->select('avatar_driver_gravatar');
+		$form['avatar_gravatar_email']->setValue('test@example.com');
+		$form['avatar_gravatar_width']->setValue(80);
+		$form['avatar_gravatar_height']->setValue(80);
+		$crawler = $this->client->submit($form);
+		$this->assertContains($this->lang('GROUP_UPDATED'), $crawler->text());
+
+		// Go back to previous page
+		$crawler = $this->request('GET', 'ucp.php?i=ucp_groups&mode=manage&action=edit&g=5&sid=' . $this->sid);
+		$this->assert_response_success();
+
+		// Test uploading a remote avatar
+		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
+		$form['avatar_driver']->select('avatar_driver_upload');
+		// use default gravatar supplied by test@example.com and default size = 80px
+		$form['avatar_upload_url']->setValue('https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg');
+		$crawler = $this->client->submit($form);
+		$this->assertContains($this->lang('GROUP_UPDATED'), $crawler->text());
+
+		// Go back to previous page
+		$crawler = $this->request('GET', 'ucp.php?i=ucp_groups&mode=manage&action=edit&g=5&sid=' . $this->sid);
+		$this->assert_response_success();
+
+		// Submit gravatar with incorrect email and correct size
+		$this->markTestIncomplete('No error when submitting incorrect ucp group settings. This needs to be fixed ASAP.');
+		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
+		$form['avatar_driver']->select('avatar_driver_gravatar');
+		$form['avatar_gravatar_email']->setValue('test.example.com');
+		$form['avatar_gravatar_width']->setValue(80);
+		$form['avatar_gravatar_height']->setValue(80);
+		$crawler = $this->client->submit($form);
+		$this->assertContains($this->lang('EMAIL_INVALID_EMAIL'), $crawler->text());
+	}
 }
-- 
cgit v1.2.1


From 76453b48ddededb9397e81aea8a75f419fcdc24b Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sat, 25 May 2013 18:15:54 +0200
Subject: [ticket/11531] Use assertContainsLang() where possible

PHBB3-11531
---
 tests/functional/avatar_acp_test.php | 30 ++++++++++-----------
 tests/functional/avatar_test.php     | 52 ++++++++++++++++++------------------
 2 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/tests/functional/avatar_acp_test.php b/tests/functional/avatar_acp_test.php
index b359212be2..623911fbf1 100644
--- a/tests/functional/avatar_acp_test.php
+++ b/tests/functional/avatar_acp_test.php
@@ -29,10 +29,10 @@ class phpbb_functional_avatar_acp_test extends phpbb_functional_test_case
 		$crawler = $this->request('GET', 'adm/index.php?i=acp_board&mode=avatar&sid=' . $this->sid);
 		$this->assert_response_success();
 		// Check the default entries we should have
-		$this->assertContains($this->lang('ALLOW_GRAVATAR'), $crawler->text());
-		$this->assertContains($this->lang('ALLOW_REMOTE'), $crawler->text());
-		$this->assertContains($this->lang('ALLOW_AVATARS'), $crawler->text());
-		$this->assertContains($this->lang('ALLOW_LOCAL'), $crawler->text());
+		$this->assertContainsLang('ALLOW_GRAVATAR', $crawler->text());
+		$this->assertContainsLang('ALLOW_REMOTE', $crawler->text());
+		$this->assertContainsLang('ALLOW_AVATARS', $crawler->text());
+		$this->assertContainsLang('ALLOW_LOCAL', $crawler->text());
 
 		// Now start setting the needed settings
 		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
@@ -41,7 +41,7 @@ class phpbb_functional_avatar_acp_test extends phpbb_functional_test_case
 		$form['config[allow_avatar_remote]']->select(1);
 		$form['config[allow_avatar_remote_upload]']->select(1);
 		$crawler = $this->client->submit($form);
-		$this->assertContains($this->lang('CONFIG_UPDATED'), $crawler->text());
+		$this->assertContainsLang('CONFIG_UPDATED', $crawler->text());
 	}
 
 	public function test_user_acp_settings()
@@ -53,7 +53,7 @@ class phpbb_functional_avatar_acp_test extends phpbb_functional_test_case
 		$form = $crawler->selectButton($this->lang('GO'))->form();
 		$form['mode']->select('avatar');
 		$crawler = $this->client->submit($form);
-		$this->assertContains($this->lang('AVATAR_TYPE'), $crawler->text());
+		$this->assertContainsLang('AVATAR_TYPE', $crawler->text());
 
 		// Test if setting a gravatar avatar properly works
 		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
@@ -62,7 +62,7 @@ class phpbb_functional_avatar_acp_test extends phpbb_functional_test_case
 		$form['avatar_gravatar_width']->setValue(80);
 		$form['avatar_gravatar_height']->setValue(80);
 		$crawler = $this->client->submit($form);
-		$this->assertContains($this->lang('USER_AVATAR_UPDATED'), $crawler->text());
+		$this->assertContainsLang('USER_AVATAR_UPDATED', $crawler->text());
 
 		// Go back to previous page
 		$crawler = $this->request('GET', 'adm/index.php?i=users&u=2&sid=' . $this->sid);
@@ -72,7 +72,7 @@ class phpbb_functional_avatar_acp_test extends phpbb_functional_test_case
 		$form = $crawler->selectButton($this->lang('GO'))->form();
 		$form['mode']->select('avatar');
 		$crawler = $this->client->submit($form);
-		$this->assertContains($this->lang('AVATAR_TYPE'), $crawler->text());
+		$this->assertContainsLang('AVATAR_TYPE', $crawler->text());
 
 		// Test uploading a remote avatar
 		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
@@ -80,7 +80,7 @@ class phpbb_functional_avatar_acp_test extends phpbb_functional_test_case
 		// use default gravatar supplied by test@example.com and default size = 80px
 		$form['avatar_upload_url']->setValue('https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg');
 		$crawler = $this->client->submit($form);
-		$this->assertContains($this->lang('USER_AVATAR_UPDATED'), $crawler->text());
+		$this->assertContainsLang('USER_AVATAR_UPDATED', $crawler->text());
 
 		// Go back to previous page
 		$crawler = $this->request('GET', 'adm/index.php?i=users&u=2&sid=' . $this->sid);
@@ -90,7 +90,7 @@ class phpbb_functional_avatar_acp_test extends phpbb_functional_test_case
 		$form = $crawler->selectButton($this->lang('GO'))->form();
 		$form['mode']->select('avatar');
 		$crawler = $this->client->submit($form);
-		$this->assertContains($this->lang('AVATAR_TYPE'), $crawler->text());
+		$this->assertContainsLang('AVATAR_TYPE', $crawler->text());
 
 		// Submit gravatar with incorrect email and correct size
 		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
@@ -99,7 +99,7 @@ class phpbb_functional_avatar_acp_test extends phpbb_functional_test_case
 		$form['avatar_gravatar_width']->setValue(80);
 		$form['avatar_gravatar_height']->setValue(80);
 		$crawler = $this->client->submit($form);
-		$this->assertContains($this->lang('EMAIL_INVALID_EMAIL'), $crawler->text());
+		$this->assertContainsLang('EMAIL_INVALID_EMAIL', $crawler->text());
 	}
 
 	public function test_group_acp_settings()
@@ -107,7 +107,7 @@ class phpbb_functional_avatar_acp_test extends phpbb_functional_test_case
 		// Test setting group avatar of admin group
 		$crawler = $this->request('GET', 'adm/index.php?i=acp_groups&mode=manage&action=edit&g=5&sid=' . $this->sid);
 		$this->assert_response_success();
-		$this->assertContains($this->lang('AVATAR_TYPE'), $crawler->text());
+		$this->assertContainsLang('AVATAR_TYPE', $crawler->text());
 
 		// Test if setting a gravatar avatar properly works
 		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
@@ -116,7 +116,7 @@ class phpbb_functional_avatar_acp_test extends phpbb_functional_test_case
 		$form['avatar_gravatar_width']->setValue(80);
 		$form['avatar_gravatar_height']->setValue(80);
 		$crawler = $this->client->submit($form);
-		$this->assertContains($this->lang('GROUP_UPDATED'), $crawler->text());
+		$this->assertContainsLang('GROUP_UPDATED', $crawler->text());
 
 		// Go back to previous page
 		$crawler = $this->request('GET', 'adm/index.php?i=acp_groups&mode=manage&action=edit&g=5&sid=' . $this->sid);
@@ -128,7 +128,7 @@ class phpbb_functional_avatar_acp_test extends phpbb_functional_test_case
 		// use default gravatar supplied by test@example.com and default size = 80px
 		$form['avatar_upload_url']->setValue('https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg');
 		$crawler = $this->client->submit($form);
-		$this->assertContains($this->lang('GROUP_UPDATED'), $crawler->text());
+		$this->assertContainsLang('GROUP_UPDATED', $crawler->text());
 
 		// Go back to previous page
 		$crawler = $this->request('GET', 'adm/index.php?i=acp_groups&mode=manage&action=edit&g=5&sid=' . $this->sid);
@@ -142,6 +142,6 @@ class phpbb_functional_avatar_acp_test extends phpbb_functional_test_case
 		$form['avatar_gravatar_width']->setValue(80);
 		$form['avatar_gravatar_height']->setValue(80);
 		$crawler = $this->client->submit($form);
-		$this->assertContains($this->lang('EMAIL_INVALID_EMAIL'), $crawler->text());
+		$this->assertContainsLang('EMAIL_INVALID_EMAIL', $crawler->text());
 	}
 }
diff --git a/tests/functional/avatar_test.php b/tests/functional/avatar_test.php
index a29fb5ddb9..e94eb4dcad 100644
--- a/tests/functional/avatar_test.php
+++ b/tests/functional/avatar_test.php
@@ -29,10 +29,10 @@ class phpbb_functional_avatar_test extends phpbb_functional_test_case
 		$crawler = $this->request('GET', 'adm/index.php?i=acp_board&mode=avatar&sid=' . $this->sid);
 		$this->assert_response_success();
 		// Check the default entries we should have
-		$this->assertContains($this->lang('ALLOW_GRAVATAR'), $crawler->text());
-		$this->assertContains($this->lang('ALLOW_REMOTE'), $crawler->text());
-		$this->assertContains($this->lang('ALLOW_AVATARS'), $crawler->text());
-		$this->assertContains($this->lang('ALLOW_LOCAL'), $crawler->text());
+		$this->assertContainsLang('ALLOW_GRAVATAR', $crawler->text());
+		$this->assertContainsLang('ALLOW_REMOTE', $crawler->text());
+		$this->assertContainsLang('ALLOW_AVATARS', $crawler->text());
+		$this->assertContainsLang('ALLOW_LOCAL', $crawler->text());
 
 		// Now start setting the needed settings
 		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
@@ -41,7 +41,7 @@ class phpbb_functional_avatar_test extends phpbb_functional_test_case
 		$form['config[allow_avatar_remote]']->select(1);
 		$form['config[allow_avatar_remote_upload]']->select(1);
 		$crawler = $this->client->submit($form);
-		$this->assertContains($this->lang('CONFIG_UPDATED'), $crawler->text());
+		$this->assertContainsLang('CONFIG_UPDATED', $crawler->text());
 	}
 
 	public function test_gravatar_avatar()
@@ -55,9 +55,9 @@ class phpbb_functional_avatar_test extends phpbb_functional_test_case
 		// Check if required form elements exist
 		$crawler = $this->request('GET', 'ucp.php?i=ucp_profile&mode=avatar&sid=' . $this->sid);
 		$this->assert_response_success();
-		$this->assertContains($this->lang('AVATAR_TYPE'), $crawler->text());
-		$this->assertContains($this->lang('AVATAR_DRIVER_GRAVATAR_TITLE'), $crawler->filter('#avatar_driver')->text());
-		$this->assertContains($this->lang('GRAVATAR_AVATAR_EMAIL'), $crawler->text());
+		$this->assertContainsLang('AVATAR_TYPE', $crawler->text());
+		$this->assertContainsLang('AVATAR_DRIVER_GRAVATAR_TITLE', $crawler->filter('#avatar_driver')->text());
+		$this->assertContainsLang('GRAVATAR_AVATAR_EMAIL', $crawler->text());
 
 		// Submit gravatar with correct email and correct size
 		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
@@ -66,7 +66,7 @@ class phpbb_functional_avatar_test extends phpbb_functional_test_case
 		$form['avatar_gravatar_width']->setValue(80);
 		$form['avatar_gravatar_height']->setValue(80);
 		$crawler = $this->client->submit($form);
-		$this->assertContains($this->lang('PROFILE_UPDATED'), $crawler->text());
+		$this->assertContainsLang('PROFILE_UPDATED', $crawler->text());
 
 		// Submit gravatar with correct mail but incorrect size
 		$crawler = $this->request('GET', 'ucp.php?i=ucp_profile&mode=avatar&sid=' . $this->sid);
@@ -92,7 +92,7 @@ class phpbb_functional_avatar_test extends phpbb_functional_test_case
 		$form['avatar_gravatar_width']->setValue(80);
 		$form['avatar_gravatar_height']->setValue(80);
 		$crawler = $this->client->submit($form);
-		$this->assertContains($this->lang('EMAIL_INVALID_EMAIL'), $crawler->text());
+		$this->assertContainsLang('EMAIL_INVALID_EMAIL', $crawler->text());
 	}
 
 	public function test_upload_avatar()
@@ -100,9 +100,9 @@ class phpbb_functional_avatar_test extends phpbb_functional_test_case
 		// Check if required form elements exist
 		$crawler = $this->request('GET', 'ucp.php?i=ucp_profile&mode=avatar&sid=' . $this->sid);
 		$this->assert_response_success();
-		$this->assertContains($this->lang('AVATAR_DRIVER_UPLOAD_TITLE'), $crawler->filter('#avatar_driver')->text());
-		$this->assertContains($this->lang('UPLOAD_AVATAR_FILE'), $crawler->text());
-		$this->assertContains($this->lang('UPLOAD_AVATAR_URL'), $crawler->text());
+		$this->assertContainsLang('AVATAR_DRIVER_UPLOAD_TITLE', $crawler->filter('#avatar_driver')->text());
+		$this->assertContainsLang('UPLOAD_AVATAR_FILE', $crawler->text());
+		$this->assertContainsLang('UPLOAD_AVATAR_URL', $crawler->text());
 
 		// Upload remote avatar with correct size and correct link
 		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
@@ -110,7 +110,7 @@ class phpbb_functional_avatar_test extends phpbb_functional_test_case
 		// use default gravatar supplied by test@example.com and default size = 80px
 		$form['avatar_upload_url']->setValue('https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg');
 		$crawler = $this->client->submit($form);
-		$this->assertContains($this->lang('PROFILE_UPDATED'), $crawler->text());
+		$this->assertContainsLang('PROFILE_UPDATED', $crawler->text());
 
 		// This will fail as the upload avatar currently expects a file that ends with an extension, e.g. .jpg
 		$crawler = $this->request('GET', 'ucp.php?i=ucp_profile&mode=avatar&sid=' . $this->sid);
@@ -120,7 +120,7 @@ class phpbb_functional_avatar_test extends phpbb_functional_test_case
 		// use default gravatar supplied by test@example.com and size (s) = 80px
 		$form['avatar_upload_url']->setValue('https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0?s=80');
 		$crawler = $this->client->submit($form);
-		$this->assertContains($this->lang('AVATAR_URL_INVALID'), $crawler->text());
+		$this->assertContainsLang('AVATAR_URL_INVALID', $crawler->text());
 
 		// Submit gravatar with correct email and correct size
 		$crawler = $this->request('GET', 'ucp.php?i=ucp_profile&mode=avatar&sid=' . $this->sid);
@@ -130,7 +130,7 @@ class phpbb_functional_avatar_test extends phpbb_functional_test_case
 		$form['avatar_driver']->select('avatar_driver_upload');
 		$form['avatar_upload_file']->setValue($this->path . 'valid.jpg');
 		$crawler = $this->client->submit($form);
-		$this->assertContains($this->lang('PROFILE_UPDATED'), $crawler->text());
+		$this->assertContainsLang('PROFILE_UPDATED', $crawler->text());
 	}
 
 	public function test_remote_avatar()
@@ -144,9 +144,9 @@ class phpbb_functional_avatar_test extends phpbb_functional_test_case
 		// Check if required form elements exist
 		$crawler = $this->request('GET', 'ucp.php?i=ucp_profile&mode=avatar&sid=' . $this->sid);
 		$this->assert_response_success();
-		$this->assertContains($this->lang('AVATAR_DRIVER_REMOTE_TITLE'), $crawler->filter('#avatar_driver')->text());
-		$this->assertContains($this->lang('LINK_REMOTE_AVATAR'), $crawler->text());
-		$this->assertContains($this->lang('LINK_REMOTE_SIZE'), $crawler->text());
+		$this->assertContainsLang('AVATAR_DRIVER_REMOTE_TITLE', $crawler->filter('#avatar_driver')->text());
+		$this->assertContainsLang('LINK_REMOTE_AVATAR', $crawler->text());
+		$this->assertContainsLang('LINK_REMOTE_SIZE', $crawler->text());
 
 		// Set remote avatar with correct size and correct link
 		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
@@ -156,7 +156,7 @@ class phpbb_functional_avatar_test extends phpbb_functional_test_case
 		$form['avatar_remote_width']->setValue(80);
 		$form['avatar_remote_height']->setValue(80);
 		$crawler = $this->client->submit($form);
-		$this->assertContains($this->lang('PROFILE_UPDATED'), $crawler->text());
+		$this->assertContainsLang('PROFILE_UPDATED', $crawler->text());
 
 		// Set remote avatar with incorrect size
 		$crawler = $this->request('GET', 'ucp.php?i=ucp_profile&mode=avatar&sid=' . $this->sid);
@@ -187,7 +187,7 @@ class phpbb_functional_avatar_test extends phpbb_functional_test_case
 		$form['avatar_remote_width']->setValue(80);
 		$form['avatar_remote_height']->setValue(80);
 		$crawler = $this->client->submit($form);
-		$this->assertContains($this->lang('NO_AVATAR_SELECTED'), $crawler->text());
+		$this->assertContainsLang('NO_AVATAR_SELECTED', $crawler->text());
 
 		/*
 		 * Enter incorrect link to a remote avatar_driver
@@ -205,7 +205,7 @@ class phpbb_functional_avatar_test extends phpbb_functional_test_case
 		$form['avatar_remote_width']->setValue(80);
 		$form['avatar_remote_height']->setValue(80);
 		$crawler = $this->client->submit($form);
-		$this->assertContains($this->lang('NO_AVATAR_SELECTED'), $crawler->text());
+		$this->assertContainsLang('NO_AVATAR_SELECTED', $crawler->text());
 	}
 
 
@@ -214,7 +214,7 @@ class phpbb_functional_avatar_test extends phpbb_functional_test_case
 		// Test setting group avatar of admin group
 		$crawler = $this->request('GET', 'ucp.php?i=ucp_groups&mode=manage&action=edit&g=5&sid=' . $this->sid);
 		$this->assert_response_success();
-		$this->assertContains($this->lang('AVATAR_TYPE'), $crawler->text());
+		$this->assertContainsLang('AVATAR_TYPE', $crawler->text());
 
 		// Test if setting a gravatar avatar properly works
 		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
@@ -223,7 +223,7 @@ class phpbb_functional_avatar_test extends phpbb_functional_test_case
 		$form['avatar_gravatar_width']->setValue(80);
 		$form['avatar_gravatar_height']->setValue(80);
 		$crawler = $this->client->submit($form);
-		$this->assertContains($this->lang('GROUP_UPDATED'), $crawler->text());
+		$this->assertContainsLang('GROUP_UPDATED', $crawler->text());
 
 		// Go back to previous page
 		$crawler = $this->request('GET', 'ucp.php?i=ucp_groups&mode=manage&action=edit&g=5&sid=' . $this->sid);
@@ -235,7 +235,7 @@ class phpbb_functional_avatar_test extends phpbb_functional_test_case
 		// use default gravatar supplied by test@example.com and default size = 80px
 		$form['avatar_upload_url']->setValue('https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg');
 		$crawler = $this->client->submit($form);
-		$this->assertContains($this->lang('GROUP_UPDATED'), $crawler->text());
+		$this->assertContainsLang('GROUP_UPDATED', $crawler->text());
 
 		// Go back to previous page
 		$crawler = $this->request('GET', 'ucp.php?i=ucp_groups&mode=manage&action=edit&g=5&sid=' . $this->sid);
@@ -249,6 +249,6 @@ class phpbb_functional_avatar_test extends phpbb_functional_test_case
 		$form['avatar_gravatar_width']->setValue(80);
 		$form['avatar_gravatar_height']->setValue(80);
 		$crawler = $this->client->submit($form);
-		$this->assertContains($this->lang('EMAIL_INVALID_EMAIL'), $crawler->text());
+		$this->assertContainsLang('EMAIL_INVALID_EMAIL', $crawler->text());
 	}
 }
-- 
cgit v1.2.1


From 79823b9cafb41f4f9405c6a5bf7e0c46b0aa751b Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sat, 25 May 2013 18:17:33 +0200
Subject: [ticket/11531] Remove incomplete flags for tests after merging PR
 #1404

Issues should be fixed by the now resolved ticket PHPBB3-11535:
http://tracker.phpbb.com/browse/PHPBB3-11535

PHPBB3-11531
---
 tests/functional/avatar_acp_test.php | 1 -
 tests/functional/avatar_test.php     | 1 -
 2 files changed, 2 deletions(-)

diff --git a/tests/functional/avatar_acp_test.php b/tests/functional/avatar_acp_test.php
index 623911fbf1..efd0317571 100644
--- a/tests/functional/avatar_acp_test.php
+++ b/tests/functional/avatar_acp_test.php
@@ -135,7 +135,6 @@ class phpbb_functional_avatar_acp_test extends phpbb_functional_test_case
 		$this->assert_response_success();
 
 		// Submit gravatar with incorrect email and correct size
-		$this->markTestIncomplete('No error when submitting incorrect acp group settings. This needs to be fixed ASAP.');
 		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
 		$form['avatar_driver']->select('avatar_driver_gravatar');
 		$form['avatar_gravatar_email']->setValue('test.example.com');
diff --git a/tests/functional/avatar_test.php b/tests/functional/avatar_test.php
index e94eb4dcad..4f0f6ee5f7 100644
--- a/tests/functional/avatar_test.php
+++ b/tests/functional/avatar_test.php
@@ -242,7 +242,6 @@ class phpbb_functional_avatar_test extends phpbb_functional_test_case
 		$this->assert_response_success();
 
 		// Submit gravatar with incorrect email and correct size
-		$this->markTestIncomplete('No error when submitting incorrect ucp group settings. This needs to be fixed ASAP.');
 		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
 		$form['avatar_driver']->select('avatar_driver_gravatar');
 		$form['avatar_gravatar_email']->setValue('test.example.com');
-- 
cgit v1.2.1


From 79dd44061bbfeab64dd2ff7b40541612c219c33c Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Tue, 25 Jun 2013 00:17:51 +0200
Subject: [ticket/11531] Add changes for supporting modified testing framework

Additionally, the groups avatar is deleted after the avatar tests in the
ucp groups page in order to prevent issues with other tests that expect
that no avatar has been set for the admin group.

PHPBB3-11531
---
 tests/functional/avatar_acp_test.php | 27 ++++++++------------
 tests/functional/avatar_test.php     | 49 ++++++++++++++++--------------------
 2 files changed, 31 insertions(+), 45 deletions(-)

diff --git a/tests/functional/avatar_acp_test.php b/tests/functional/avatar_acp_test.php
index efd0317571..609ccbb477 100644
--- a/tests/functional/avatar_acp_test.php
+++ b/tests/functional/avatar_acp_test.php
@@ -27,7 +27,6 @@ class phpbb_functional_avatar_acp_test extends phpbb_functional_test_case
 	public function test_acp_settings()
 	{
 		$crawler = $this->request('GET', 'adm/index.php?i=acp_board&mode=avatar&sid=' . $this->sid);
-		$this->assert_response_success();
 		// Check the default entries we should have
 		$this->assertContainsLang('ALLOW_GRAVATAR', $crawler->text());
 		$this->assertContainsLang('ALLOW_REMOTE', $crawler->text());
@@ -40,19 +39,18 @@ class phpbb_functional_avatar_acp_test extends phpbb_functional_test_case
 		$form['config[allow_avatar_gravatar]']->select(1);
 		$form['config[allow_avatar_remote]']->select(1);
 		$form['config[allow_avatar_remote_upload]']->select(1);
-		$crawler = $this->client->submit($form);
+		$crawler = self::submit($form);
 		$this->assertContainsLang('CONFIG_UPDATED', $crawler->text());
 	}
 
 	public function test_user_acp_settings()
 	{
 		$crawler = $this->request('GET', 'adm/index.php?i=users&u=2&sid=' . $this->sid);
-		$this->assert_response_success();
 
 		// Select "Avatar" in the drop-down menu
 		$form = $crawler->selectButton($this->lang('GO'))->form();
 		$form['mode']->select('avatar');
-		$crawler = $this->client->submit($form);
+		$crawler = self::submit($form);
 		$this->assertContainsLang('AVATAR_TYPE', $crawler->text());
 
 		// Test if setting a gravatar avatar properly works
@@ -61,17 +59,16 @@ class phpbb_functional_avatar_acp_test extends phpbb_functional_test_case
 		$form['avatar_gravatar_email']->setValue('test@example.com');
 		$form['avatar_gravatar_width']->setValue(80);
 		$form['avatar_gravatar_height']->setValue(80);
-		$crawler = $this->client->submit($form);
+		$crawler = self::submit($form);
 		$this->assertContainsLang('USER_AVATAR_UPDATED', $crawler->text());
 
 		// Go back to previous page
 		$crawler = $this->request('GET', 'adm/index.php?i=users&u=2&sid=' . $this->sid);
-		$this->assert_response_success();
 
 		// Select "Avatar" in the drop-down menu
 		$form = $crawler->selectButton($this->lang('GO'))->form();
 		$form['mode']->select('avatar');
-		$crawler = $this->client->submit($form);
+		$crawler = self::submit($form);
 		$this->assertContainsLang('AVATAR_TYPE', $crawler->text());
 
 		// Test uploading a remote avatar
@@ -79,17 +76,16 @@ class phpbb_functional_avatar_acp_test extends phpbb_functional_test_case
 		$form['avatar_driver']->select('avatar_driver_upload');
 		// use default gravatar supplied by test@example.com and default size = 80px
 		$form['avatar_upload_url']->setValue('https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg');
-		$crawler = $this->client->submit($form);
+		$crawler = self::submit($form);
 		$this->assertContainsLang('USER_AVATAR_UPDATED', $crawler->text());
 
 		// Go back to previous page
 		$crawler = $this->request('GET', 'adm/index.php?i=users&u=2&sid=' . $this->sid);
-		$this->assert_response_success();
 
 		// Select "Avatar" in the drop-down menu
 		$form = $crawler->selectButton($this->lang('GO'))->form();
 		$form['mode']->select('avatar');
-		$crawler = $this->client->submit($form);
+		$crawler = self::submit($form);
 		$this->assertContainsLang('AVATAR_TYPE', $crawler->text());
 
 		// Submit gravatar with incorrect email and correct size
@@ -98,7 +94,7 @@ class phpbb_functional_avatar_acp_test extends phpbb_functional_test_case
 		$form['avatar_gravatar_email']->setValue('test.example.com');
 		$form['avatar_gravatar_width']->setValue(80);
 		$form['avatar_gravatar_height']->setValue(80);
-		$crawler = $this->client->submit($form);
+		$crawler = self::submit($form);
 		$this->assertContainsLang('EMAIL_INVALID_EMAIL', $crawler->text());
 	}
 
@@ -106,7 +102,6 @@ class phpbb_functional_avatar_acp_test extends phpbb_functional_test_case
 	{
 		// Test setting group avatar of admin group
 		$crawler = $this->request('GET', 'adm/index.php?i=acp_groups&mode=manage&action=edit&g=5&sid=' . $this->sid);
-		$this->assert_response_success();
 		$this->assertContainsLang('AVATAR_TYPE', $crawler->text());
 
 		// Test if setting a gravatar avatar properly works
@@ -115,24 +110,22 @@ class phpbb_functional_avatar_acp_test extends phpbb_functional_test_case
 		$form['avatar_gravatar_email']->setValue('test@example.com');
 		$form['avatar_gravatar_width']->setValue(80);
 		$form['avatar_gravatar_height']->setValue(80);
-		$crawler = $this->client->submit($form);
+		$crawler = self::submit($form);
 		$this->assertContainsLang('GROUP_UPDATED', $crawler->text());
 
 		// Go back to previous page
 		$crawler = $this->request('GET', 'adm/index.php?i=acp_groups&mode=manage&action=edit&g=5&sid=' . $this->sid);
-		$this->assert_response_success();
 
 		// Test uploading a remote avatar
 		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
 		$form['avatar_driver']->select('avatar_driver_upload');
 		// use default gravatar supplied by test@example.com and default size = 80px
 		$form['avatar_upload_url']->setValue('https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg');
-		$crawler = $this->client->submit($form);
+		$crawler = self::submit($form);
 		$this->assertContainsLang('GROUP_UPDATED', $crawler->text());
 
 		// Go back to previous page
 		$crawler = $this->request('GET', 'adm/index.php?i=acp_groups&mode=manage&action=edit&g=5&sid=' . $this->sid);
-		$this->assert_response_success();
 
 		// Submit gravatar with incorrect email and correct size
 		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
@@ -140,7 +133,7 @@ class phpbb_functional_avatar_acp_test extends phpbb_functional_test_case
 		$form['avatar_gravatar_email']->setValue('test.example.com');
 		$form['avatar_gravatar_width']->setValue(80);
 		$form['avatar_gravatar_height']->setValue(80);
-		$crawler = $this->client->submit($form);
+		$crawler = self::submit($form);
 		$this->assertContainsLang('EMAIL_INVALID_EMAIL', $crawler->text());
 	}
 }
diff --git a/tests/functional/avatar_test.php b/tests/functional/avatar_test.php
index 4f0f6ee5f7..c96ed46d30 100644
--- a/tests/functional/avatar_test.php
+++ b/tests/functional/avatar_test.php
@@ -27,7 +27,6 @@ class phpbb_functional_avatar_test extends phpbb_functional_test_case
 	public function test_acp_settings()
 	{
 		$crawler = $this->request('GET', 'adm/index.php?i=acp_board&mode=avatar&sid=' . $this->sid);
-		$this->assert_response_success();
 		// Check the default entries we should have
 		$this->assertContainsLang('ALLOW_GRAVATAR', $crawler->text());
 		$this->assertContainsLang('ALLOW_REMOTE', $crawler->text());
@@ -40,7 +39,7 @@ class phpbb_functional_avatar_test extends phpbb_functional_test_case
 		$form['config[allow_avatar_gravatar]']->select(1);
 		$form['config[allow_avatar_remote]']->select(1);
 		$form['config[allow_avatar_remote_upload]']->select(1);
-		$crawler = $this->client->submit($form);
+		$crawler = self::submit($form);
 		$this->assertContainsLang('CONFIG_UPDATED', $crawler->text());
 	}
 
@@ -48,13 +47,11 @@ class phpbb_functional_avatar_test extends phpbb_functional_test_case
 	{
 		// Get ACP settings
 		$crawler = $this->request('GET', 'adm/index.php?i=acp_board&mode=avatar&sid=' . $this->sid);
-		$this->assert_response_success();
 		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
 		$this->form_content = $form->getValues();
 
 		// Check if required form elements exist
 		$crawler = $this->request('GET', 'ucp.php?i=ucp_profile&mode=avatar&sid=' . $this->sid);
-		$this->assert_response_success();
 		$this->assertContainsLang('AVATAR_TYPE', $crawler->text());
 		$this->assertContainsLang('AVATAR_DRIVER_GRAVATAR_TITLE', $crawler->filter('#avatar_driver')->text());
 		$this->assertContainsLang('GRAVATAR_AVATAR_EMAIL', $crawler->text());
@@ -65,7 +62,7 @@ class phpbb_functional_avatar_test extends phpbb_functional_test_case
 		$form['avatar_gravatar_email']->setValue('test@example.com');
 		$form['avatar_gravatar_width']->setValue(80);
 		$form['avatar_gravatar_height']->setValue(80);
-		$crawler = $this->client->submit($form);
+		$crawler = self::submit($form);
 		$this->assertContainsLang('PROFILE_UPDATED', $crawler->text());
 
 		// Submit gravatar with correct mail but incorrect size
@@ -75,7 +72,7 @@ class phpbb_functional_avatar_test extends phpbb_functional_test_case
 		$form['avatar_gravatar_email']->setValue('test@example.com');
 		$form['avatar_gravatar_width']->setValue(120);
 		$form['avatar_gravatar_height']->setValue(120);
-		$crawler = $this->client->submit($form);
+		$crawler = self::submit($form);
 		$this->assertContains(sprintf($this->lang['AVATAR_WRONG_SIZE'],
 			$this->form_content['config[avatar_min_width]'],
 			$this->form_content['config[avatar_min_height]'],
@@ -91,7 +88,7 @@ class phpbb_functional_avatar_test extends phpbb_functional_test_case
 		$form['avatar_gravatar_email']->setValue('test.example.com');
 		$form['avatar_gravatar_width']->setValue(80);
 		$form['avatar_gravatar_height']->setValue(80);
-		$crawler = $this->client->submit($form);
+		$crawler = self::submit($form);
 		$this->assertContainsLang('EMAIL_INVALID_EMAIL', $crawler->text());
 	}
 
@@ -99,7 +96,6 @@ class phpbb_functional_avatar_test extends phpbb_functional_test_case
 	{
 		// Check if required form elements exist
 		$crawler = $this->request('GET', 'ucp.php?i=ucp_profile&mode=avatar&sid=' . $this->sid);
-		$this->assert_response_success();
 		$this->assertContainsLang('AVATAR_DRIVER_UPLOAD_TITLE', $crawler->filter('#avatar_driver')->text());
 		$this->assertContainsLang('UPLOAD_AVATAR_FILE', $crawler->text());
 		$this->assertContainsLang('UPLOAD_AVATAR_URL', $crawler->text());
@@ -109,27 +105,25 @@ class phpbb_functional_avatar_test extends phpbb_functional_test_case
 		$form['avatar_driver']->select('avatar_driver_upload');
 		// use default gravatar supplied by test@example.com and default size = 80px
 		$form['avatar_upload_url']->setValue('https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg');
-		$crawler = $this->client->submit($form);
+		$crawler = self::submit($form);
 		$this->assertContainsLang('PROFILE_UPDATED', $crawler->text());
 
 		// This will fail as the upload avatar currently expects a file that ends with an extension, e.g. .jpg
 		$crawler = $this->request('GET', 'ucp.php?i=ucp_profile&mode=avatar&sid=' . $this->sid);
-		$this->assert_response_success();
 		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
 		$form['avatar_driver']->select('avatar_driver_upload');
 		// use default gravatar supplied by test@example.com and size (s) = 80px
 		$form['avatar_upload_url']->setValue('https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0?s=80');
-		$crawler = $this->client->submit($form);
+		$crawler = self::submit($form);
 		$this->assertContainsLang('AVATAR_URL_INVALID', $crawler->text());
 
 		// Submit gravatar with correct email and correct size
 		$crawler = $this->request('GET', 'ucp.php?i=ucp_profile&mode=avatar&sid=' . $this->sid);
-		$this->assert_response_success();
 		$this->markTestIncomplete('Test fails due to bug in DomCrawler with Symfony < 2.2: https://github.com/symfony/symfony/issues/4674.');
 		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
 		$form['avatar_driver']->select('avatar_driver_upload');
 		$form['avatar_upload_file']->setValue($this->path . 'valid.jpg');
-		$crawler = $this->client->submit($form);
+		$crawler = self::submit($form);
 		$this->assertContainsLang('PROFILE_UPDATED', $crawler->text());
 	}
 
@@ -137,13 +131,11 @@ class phpbb_functional_avatar_test extends phpbb_functional_test_case
 	{
 		// Get ACP settings
 		$crawler = $this->request('GET', 'adm/index.php?i=acp_board&mode=avatar&sid=' . $this->sid);
-		$this->assert_response_success();
 		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
 		$this->form_content = $form->getValues();
 
 		// Check if required form elements exist
 		$crawler = $this->request('GET', 'ucp.php?i=ucp_profile&mode=avatar&sid=' . $this->sid);
-		$this->assert_response_success();
 		$this->assertContainsLang('AVATAR_DRIVER_REMOTE_TITLE', $crawler->filter('#avatar_driver')->text());
 		$this->assertContainsLang('LINK_REMOTE_AVATAR', $crawler->text());
 		$this->assertContainsLang('LINK_REMOTE_SIZE', $crawler->text());
@@ -155,19 +147,18 @@ class phpbb_functional_avatar_test extends phpbb_functional_test_case
 		$form['avatar_remote_url']->setValue('https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg');
 		$form['avatar_remote_width']->setValue(80);
 		$form['avatar_remote_height']->setValue(80);
-		$crawler = $this->client->submit($form);
+		$crawler = self::submit($form);
 		$this->assertContainsLang('PROFILE_UPDATED', $crawler->text());
 
 		// Set remote avatar with incorrect size
 		$crawler = $this->request('GET', 'ucp.php?i=ucp_profile&mode=avatar&sid=' . $this->sid);
-		$this->assert_response_success();
 		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
 		$form['avatar_driver']->select('avatar_driver_remote');
 		// use default gravatar supplied by test@example.com and size (s) = 80px
 		$form['avatar_remote_url']->setValue('https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg');
 		$form['avatar_remote_width']->setValue(120);
 		$form['avatar_remote_height']->setValue(120);
-		$crawler = $this->client->submit($form);
+		$crawler = self::submit($form);
 		$this->assertContains(sprintf($this->lang['AVATAR_WRONG_SIZE'],
 			$this->form_content['config[avatar_min_width]'],
 			$this->form_content['config[avatar_min_height]'],
@@ -179,14 +170,13 @@ class phpbb_functional_avatar_test extends phpbb_functional_test_case
 
 		// Enter correct data in form entries but select incorrect avatar driver
 		$crawler = $this->request('GET', 'ucp.php?i=ucp_profile&mode=avatar&sid=' . $this->sid);
-		$this->assert_response_success();
 		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
 		$form['avatar_driver']->select('avatar_driver_upload');
 		// use default gravatar supplied by test@example.com and size (s) = 80px
 		$form['avatar_remote_url']->setValue('https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg');
 		$form['avatar_remote_width']->setValue(80);
 		$form['avatar_remote_height']->setValue(80);
-		$crawler = $this->client->submit($form);
+		$crawler = self::submit($form);
 		$this->assertContainsLang('NO_AVATAR_SELECTED', $crawler->text());
 
 		/*
@@ -196,7 +186,6 @@ class phpbb_functional_avatar_test extends phpbb_functional_test_case
 		 * the current phpBB 3.0.11 release.
 		 */
 		$crawler = $this->request('GET', 'ucp.php?i=ucp_profile&mode=avatar&sid=' . $this->sid);
-		$this->assert_response_success();
 		$this->markTestIncomplete('Test currently fails because the remote avatar does not seem to check if it is an image');
 		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
 		$form['avatar_driver']->select('avatar_driver_remote');
@@ -204,7 +193,7 @@ class phpbb_functional_avatar_test extends phpbb_functional_test_case
 		$form['avatar_remote_url']->setValue('https://www.phpbb.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg');
 		$form['avatar_remote_width']->setValue(80);
 		$form['avatar_remote_height']->setValue(80);
-		$crawler = $this->client->submit($form);
+		$crawler = self::submit($form);
 		$this->assertContainsLang('NO_AVATAR_SELECTED', $crawler->text());
 	}
 
@@ -213,7 +202,6 @@ class phpbb_functional_avatar_test extends phpbb_functional_test_case
 	{
 		// Test setting group avatar of admin group
 		$crawler = $this->request('GET', 'ucp.php?i=ucp_groups&mode=manage&action=edit&g=5&sid=' . $this->sid);
-		$this->assert_response_success();
 		$this->assertContainsLang('AVATAR_TYPE', $crawler->text());
 
 		// Test if setting a gravatar avatar properly works
@@ -222,24 +210,22 @@ class phpbb_functional_avatar_test extends phpbb_functional_test_case
 		$form['avatar_gravatar_email']->setValue('test@example.com');
 		$form['avatar_gravatar_width']->setValue(80);
 		$form['avatar_gravatar_height']->setValue(80);
-		$crawler = $this->client->submit($form);
+		$crawler = self::submit($form);
 		$this->assertContainsLang('GROUP_UPDATED', $crawler->text());
 
 		// Go back to previous page
 		$crawler = $this->request('GET', 'ucp.php?i=ucp_groups&mode=manage&action=edit&g=5&sid=' . $this->sid);
-		$this->assert_response_success();
 
 		// Test uploading a remote avatar
 		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
 		$form['avatar_driver']->select('avatar_driver_upload');
 		// use default gravatar supplied by test@example.com and default size = 80px
 		$form['avatar_upload_url']->setValue('https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg');
-		$crawler = $this->client->submit($form);
+		$crawler = self::submit($form);
 		$this->assertContainsLang('GROUP_UPDATED', $crawler->text());
 
 		// Go back to previous page
 		$crawler = $this->request('GET', 'ucp.php?i=ucp_groups&mode=manage&action=edit&g=5&sid=' . $this->sid);
-		$this->assert_response_success();
 
 		// Submit gravatar with incorrect email and correct size
 		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
@@ -247,7 +233,14 @@ class phpbb_functional_avatar_test extends phpbb_functional_test_case
 		$form['avatar_gravatar_email']->setValue('test.example.com');
 		$form['avatar_gravatar_width']->setValue(80);
 		$form['avatar_gravatar_height']->setValue(80);
-		$crawler = $this->client->submit($form);
+		$crawler = self::submit($form);
 		$this->assertContainsLang('EMAIL_INVALID_EMAIL', $crawler->text());
+
+		// Delete avatar
+		$crawler = $this->request('GET', 'ucp.php?i=ucp_groups&mode=manage&action=edit&g=5&sid=' . $this->sid);
+		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
+		$form['avatar_delete']->tick();
+		$crawler = self::submit($form);
+		$this->assertContainsLang('GROUP_UPDATED', $crawler->text());
 	}
 }
-- 
cgit v1.2.1


From 1d9d22cc7676fac14bfe4a5b67537ccfb4f1849d Mon Sep 17 00:00:00 2001
From: Andy Chase <asperous2@gmail.com>
Date: Wed, 26 Jun 2013 12:43:37 -0700
Subject: [ticket/11620] Add testable facade for sessions.php

Since many functions in session.php have global variables inside the function,
this exposes those functions through a testable facade that uses testable_factory's
mock global variables to modify global variables used in the functions.

 This is using the facade pattern to provide a testable "front" to the functions in sessions.php.

 PHPBB3-11620
---
 tests/session/testable_facade.php | 49 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 tests/session/testable_facade.php

diff --git a/tests/session/testable_facade.php b/tests/session/testable_facade.php
new file mode 100644
index 0000000000..d4c03ec8d5
--- /dev/null
+++ b/tests/session/testable_facade.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ *
+ * @package testing
+ * @copyright (c) 2013 phpBB Group
+ * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+ *
+ */
+
+require_once dirname(__FILE__) . '/testable_factory.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/session.php';
+
+/**
+ * This class exists to expose session.php's functions in a more testable way.
+ *
+ * Since many functions in session.php have global variables inside the function,
+ * this exposes those functions through a testable facade that uses testable_factory's
+ * mock global variables to modify global variables used in the functions.
+ *
+ * This is using the facade pattern to provide a testable "front" to the functions in sessions.php.
+ *
+ */
+class phpbb_session_testable_facade
+{
+	public static function extract_current_page($db, $session_factory, $root_path, $php_self, $query_string, $request_uri) {
+		$session_factory->get_session($db);
+		global $request;
+		$request->overwrite('PHP_SELF', $php_self, phpbb_request_interface::SERVER);
+		$request->overwrite('QUERY_STRING', $query_string, phpbb_request_interface::SERVER);
+		$request->overwrite('REQUEST_URI', $request_uri, phpbb_request_interface::SERVER);
+		return phpbb_session::extract_current_page($root_path, phpbb_request_interface::SERVER);
+	}
+
+	// [To be completed]
+	// public static function extract_current_hostname() {}
+	// public static function session_begin($update_session_page = true) {}
+	// public static function session_create($user_id = false, $set_admin = false, $persist_login = false, $viewonline = true) {}
+	// public static function session_kill($new_session = true) {}
+	// public static function session_gc() {}
+	// public static function set_cookie($name, $cookiedata, $cookietime) {}
+	// public static function check_ban($user_id = false, $user_ips = false, $user_email = false, $return = false) {}
+	// public static function check_dnsbl($mode, $ip = false) {}
+	// public static function set_login_key($user_id = false, $key = false, $user_ip = false) {}
+	// public static function reset_login_keys($user_id = false) {}
+	// public static function validate_referer($check_script_path = false) {}
+	// public static function update_session($session_data, $session_id = null) {}
+	// public static function unset_admin() {}
+}
+
-- 
cgit v1.2.1


From 19a348e35990511186fc8e987b28b5f8b34c6650 Mon Sep 17 00:00:00 2001
From: Andy Chase <asperous2@gmail.com>
Date: Wed, 26 Jun 2013 12:44:14 -0700
Subject: [ticket/11620] Add test for test_extract_current_page

PHPBB3-11620
---
 tests/session/class_functions_test.php | 49 ++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 tests/session/class_functions_test.php

diff --git a/tests/session/class_functions_test.php b/tests/session/class_functions_test.php
new file mode 100644
index 0000000000..c4ae5628f1
--- /dev/null
+++ b/tests/session/class_functions_test.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ *
+ * @package testing
+ * @copyright (c) 2013 phpBB Group
+ * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+ *
+ */
+
+require_once dirname(__FILE__) . '/testable_facade.php';
+
+class phpbb_session_class_functions_test extends phpbb_database_test_case
+{
+	public $session_factory;
+	public $db;
+
+	public function getDataSet()
+	{
+		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/sessions_empty.xml');
+	}
+
+	public function setUp()
+	{
+		$this->session_factory = new phpbb_session_testable_factory;
+		$this->db = $this->new_dbal();
+	}
+
+	function test_extract_current_page()
+	{
+		$expected_fields = array(
+			'page_name' => "index.php",
+			'script_path' => "/phpBB/"
+		);
+
+		$output = phpbb_session_testable_facade::extract_current_page(
+			$this->db,
+			$this->session_factory,
+			/* Root Path   */ "./",
+			/* PHP Self    */ "/phpBB/index.php",
+			/* Query String*/ "",
+			/* Request URI */ "/phpBB/"
+		);
+
+		foreach($expected_fields as $field => $expected_value)
+		{
+			$this->assertSame($expected_value, $output[$field]);
+		}
+	}
+}
-- 
cgit v1.2.1


From e1d957c3eed77ffb02eaf2c9422f09e71b12f938 Mon Sep 17 00:00:00 2001
From: Andy Chase <asperous2@gmail.com>
Date: Wed, 26 Jun 2013 12:49:05 -0700
Subject: [ticket/11620] Remove accidental argument from testable_facade.

PHPBB3-11620
---
 tests/session/testable_facade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/session/testable_facade.php b/tests/session/testable_facade.php
index d4c03ec8d5..f85332c94a 100644
--- a/tests/session/testable_facade.php
+++ b/tests/session/testable_facade.php
@@ -28,7 +28,7 @@ class phpbb_session_testable_facade
 		$request->overwrite('PHP_SELF', $php_self, phpbb_request_interface::SERVER);
 		$request->overwrite('QUERY_STRING', $query_string, phpbb_request_interface::SERVER);
 		$request->overwrite('REQUEST_URI', $request_uri, phpbb_request_interface::SERVER);
-		return phpbb_session::extract_current_page($root_path, phpbb_request_interface::SERVER);
+		return phpbb_session::extract_current_page($root_path);
 	}
 
 	// [To be completed]
-- 
cgit v1.2.1


From 9f156e995468d322a9b90f188cb31df059b03d82 Mon Sep 17 00:00:00 2001
From: Andy Chase <asperous2@gmail.com>
Date: Thu, 27 Jun 2013 15:56:19 -0700
Subject: [ticket/11620] Rename class_functions_test -> extract_page_test

Renaming this file because it is going to contain a large data provider,
so I'd rather split this test out.

PHPBB3-11620
---
 tests/session/class_functions_test.php | 49 ----------------------------------
 tests/session/extract_page_test.php    | 49 ++++++++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+), 49 deletions(-)
 delete mode 100644 tests/session/class_functions_test.php
 create mode 100644 tests/session/extract_page_test.php

diff --git a/tests/session/class_functions_test.php b/tests/session/class_functions_test.php
deleted file mode 100644
index c4ae5628f1..0000000000
--- a/tests/session/class_functions_test.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/**
- *
- * @package testing
- * @copyright (c) 2013 phpBB Group
- * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
- *
- */
-
-require_once dirname(__FILE__) . '/testable_facade.php';
-
-class phpbb_session_class_functions_test extends phpbb_database_test_case
-{
-	public $session_factory;
-	public $db;
-
-	public function getDataSet()
-	{
-		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/sessions_empty.xml');
-	}
-
-	public function setUp()
-	{
-		$this->session_factory = new phpbb_session_testable_factory;
-		$this->db = $this->new_dbal();
-	}
-
-	function test_extract_current_page()
-	{
-		$expected_fields = array(
-			'page_name' => "index.php",
-			'script_path' => "/phpBB/"
-		);
-
-		$output = phpbb_session_testable_facade::extract_current_page(
-			$this->db,
-			$this->session_factory,
-			/* Root Path   */ "./",
-			/* PHP Self    */ "/phpBB/index.php",
-			/* Query String*/ "",
-			/* Request URI */ "/phpBB/"
-		);
-
-		foreach($expected_fields as $field => $expected_value)
-		{
-			$this->assertSame($expected_value, $output[$field]);
-		}
-	}
-}
diff --git a/tests/session/extract_page_test.php b/tests/session/extract_page_test.php
new file mode 100644
index 0000000000..fca7763bc3
--- /dev/null
+++ b/tests/session/extract_page_test.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ *
+ * @package testing
+ * @copyright (c) 2013 phpBB Group
+ * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+ *
+ */
+
+require_once dirname(__FILE__) . '/testable_facade.php';
+
+class phpbb_session_extract_page_test extends phpbb_database_test_case
+{
+	public $session_factory;
+	public $db;
+
+	public function getDataSet()
+	{
+		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/sessions_empty.xml');
+	}
+
+	public function setUp()
+	{
+		$this->session_factory = new phpbb_session_testable_factory;
+		$this->db = $this->new_dbal();
+	}
+
+	function test_extract_current_page()
+	{
+		$expected_fields = array(
+			'page_name' => "index.php",
+			'script_path' => "/phpBB/"
+		);
+
+		$output = phpbb_session_testable_facade::extract_current_page(
+			$this->db,
+			$this->session_factory,
+			/* Root Path   */ "./",
+			/* PHP Self    */ "/phpBB/index.php",
+			/* Query String*/ "",
+			/* Request URI */ "/phpBB/"
+		);
+
+		foreach($expected_fields as $field => $expected_value)
+		{
+			$this->assertSame($expected_value, $output[$field]);
+		}
+	}
+}
-- 
cgit v1.2.1


From 7fd03abcab531d3e989753492ab0cce78549c1a3 Mon Sep 17 00:00:00 2001
From: Andy Chase <asperous2@gmail.com>
Date: Thu, 27 Jun 2013 15:57:58 -0700
Subject: [ticket/11620] Add data provider to extract_page

These test cases were taken from a live session,
more test cases should be added to test specific
functionality in this function.

PHPBB3-11620
---
 tests/session/extract_page_test.php | 105 +++++++++++++++++++++++++++++++-----
 1 file changed, 91 insertions(+), 14 deletions(-)

diff --git a/tests/session/extract_page_test.php b/tests/session/extract_page_test.php
index fca7763bc3..24fcb98164 100644
--- a/tests/session/extract_page_test.php
+++ b/tests/session/extract_page_test.php
@@ -14,6 +14,88 @@ class phpbb_session_extract_page_test extends phpbb_database_test_case
 	public $session_factory;
 	public $db;
 
+	static public function extract_current_page_data()
+	{
+		return array(
+			array(
+				'./',
+				'/phpBB/index.php',
+				'',
+				'/phpBB/',
+				array(
+					'page_name' => 'index.php',
+					'page_dir' => '',
+					'query_string' => '',
+					'script_path' => '/phpBB/',
+					'root_script_path' => '/phpBB/',
+					'page' => 'index.php',
+					'forum' => 0
+				)
+			) ,
+			array(
+				'./',
+				'/phpBB/ucp.php',
+				'mode=login',
+				'/phpBB/ucp.php?mode=login',
+				array(
+					'page_name' => 'ucp.php',
+					'page_dir' => '',
+					'query_string' => 'mode=login',
+					'script_path' => '/phpBB/',
+					'root_script_path' => '/phpBB/',
+					'page' => 'ucp.php?mode=login',
+					'forum' => 0
+				)
+			) ,
+			array(
+				'./',
+				'/phpBB/ucp.php',
+				'mode=register',
+				'/phpBB/ucp.php?mode=register',
+				array(
+					'page_name' => 'ucp.php',
+					'page_dir' => '',
+					'query_string' => 'mode=register',
+					'script_path' => '/phpBB/',
+					'root_script_path' => '/phpBB/',
+					'page' => 'ucp.php?mode=register',
+					'forum' => 0
+				)
+			) ,
+			array(
+				'./',
+				'/phpBB/ucp.php',
+				'mode=register',
+				'/phpBB/ucp.php?mode=register',
+				array(
+					'page_name' => 'ucp.php',
+					'page_dir' => '',
+					'query_string' => 'mode=register',
+					'script_path' => '/phpBB/',
+					'root_script_path' => '/phpBB/',
+					'page' => 'ucp.php?mode=register',
+					'forum' => 0
+				)
+			) ,
+			array(
+				'./../',
+				'/phpBB/adm/index.php',
+				'sid=e7215d958cdd41a6fc13509bebe53e42',
+				'/phpBB/adm/index.php?sid=e7215d958cdd41a6fc13509bebe53e42',
+				array(
+					'page_name' => 'index.php',
+					//'page_dir' => 'adm',
+					// ^-- Ignored because .. returns different directory in live vs testing
+					'query_string' => '',
+					'script_path' => '/phpBB/adm/',
+					'root_script_path' => '/phpBB/',
+					//'page' => 'adm/index.php',
+					'forum' => 0
+				)
+			)
+		);
+	}
+
 	public function getDataSet()
 	{
 		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/sessions_empty.xml');
@@ -25,25 +107,20 @@ class phpbb_session_extract_page_test extends phpbb_database_test_case
 		$this->db = $this->new_dbal();
 	}
 
-	function test_extract_current_page()
+	/** @dataProvider extract_current_page_data */
+	function test_extract_current_page($root_path, $php_self, $query_string, $request_uri, $expected)
 	{
-		$expected_fields = array(
-			'page_name' => "index.php",
-			'script_path' => "/phpBB/"
-		);
-
 		$output = phpbb_session_testable_facade::extract_current_page(
 			$this->db,
 			$this->session_factory,
-			/* Root Path   */ "./",
-			/* PHP Self    */ "/phpBB/index.php",
-			/* Query String*/ "",
-			/* Request URI */ "/phpBB/"
+			$root_path,
+			$php_self,
+			$query_string,
+			$request_uri
 		);
 
-		foreach($expected_fields as $field => $expected_value)
-		{
-			$this->assertSame($expected_value, $output[$field]);
-		}
+		// This compares the result of the output.
+		// Any keys that are not in the expected array are overwritten by the output (aka not checked).
+		$this->assert_array_content_equals(array_merge($output, $expected), $output);
 	}
 }
-- 
cgit v1.2.1


From b8d9d7b79f98093a5870db2e3b60663ed5069d39 Mon Sep 17 00:00:00 2001
From: Andy Chase <asperous2@gmail.com>
Date: Mon, 1 Jul 2013 00:11:44 -0700
Subject: [ticket/11620] Add extract_current_hostname

Add a tests for extracting the current hostname from session.

PHPBB3-11620
---
 tests/session/extract_hostname_test.php | 58 +++++++++++++++++++++++++++++++++
 tests/session/testable_facade.php       | 11 ++++++-
 2 files changed, 68 insertions(+), 1 deletion(-)
 create mode 100644 tests/session/extract_hostname_test.php

diff --git a/tests/session/extract_hostname_test.php b/tests/session/extract_hostname_test.php
new file mode 100644
index 0000000000..a126626ae3
--- /dev/null
+++ b/tests/session/extract_hostname_test.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ *
+ * @package testing
+ * @copyright (c) 2013 phpBB Group
+ * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+ *
+ */
+
+require_once dirname(__FILE__) . '/testable_facade.php';
+
+class phpbb_session_extract_hostname_test extends phpbb_database_test_case
+{
+	public $session_factory;
+	public $db;
+
+	public function getDataSet()
+	{
+		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/sessions_empty.xml');
+	}
+
+	public function setUp()
+	{
+		$this->session_factory = new phpbb_session_testable_factory;
+		$this->db = $this->new_dbal();
+	}
+
+	static public function extract_current_hostname_data()
+	{
+		return array (
+			// [Input] $host, $server_name_config, $cookie_domain_config, [Expected] $output
+			// If host is ip use that 	ipv4
+			array("127.0.0.1", "skipped.org", "skipped.org", "127.0.0.1"),
+			// If no host but server name matches cookie_domain use that
+			array("", "example.org", "example.org", "example.org"),
+			// If there is a host uri use that
+			array("example.org", False, False, "example.org"),
+			// "best approach" guessing
+			array("", "example.org", False, "example.org"),
+			array("", False, "127.0.0.1", "127.0.0.1"),
+			array("", False, False, php_uname('n')),
+		);
+	}
+
+	/** @dataProvider extract_current_hostname_data */
+	function test_extract_current_hostname($host, $server_name_config, $cookie_domain_config, $expected)
+	{
+		$output = phpbb_session_testable_facade::extract_current_hostname(
+			$this->db,
+			$this->session_factory,
+			$host,
+			$server_name_config,
+			$cookie_domain_config
+		);
+
+		$this->assertEquals($expected, $output);
+	}
+}
diff --git a/tests/session/testable_facade.php b/tests/session/testable_facade.php
index f85332c94a..a4a3d63ed4 100644
--- a/tests/session/testable_facade.php
+++ b/tests/session/testable_facade.php
@@ -31,8 +31,17 @@ class phpbb_session_testable_facade
 		return phpbb_session::extract_current_page($root_path);
 	}
 
+	public static function extract_current_hostname($db, $session_factory, $host, $server_name_config, $cookie_domain_config) {
+		$session = $session_factory->get_session($db);
+		global $config, $request;
+		$config['server_name'] = $server_name_config;
+		$config['cookie_domain'] = $cookie_domain_config;
+		$request->overwrite('SERVER_NAME', $host, phpbb_request_interface::SERVER);
+		$request->overwrite('Host', $host, phpbb_request_interface::SERVER);
+		// Note: There is a php_uname fallthrough in this method that this function doesn't override
+		return $session->extract_current_hostname();
+	}
 	// [To be completed]
-	// public static function extract_current_hostname() {}
 	// public static function session_begin($update_session_page = true) {}
 	// public static function session_create($user_id = false, $set_admin = false, $persist_login = false, $viewonline = true) {}
 	// public static function session_kill($new_session = true) {}
-- 
cgit v1.2.1


From 71fbe74edea4ad2618fbd9161e83ccaabafea9ac Mon Sep 17 00:00:00 2001
From: Andy Chase <asperous2@gmail.com>
Date: Mon, 1 Jul 2013 15:07:06 -0700
Subject: [ticket/11620] Fix quotes in extract_hostname_test

PHPBB3-11620
---
 tests/session/extract_hostname_test.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/tests/session/extract_hostname_test.php b/tests/session/extract_hostname_test.php
index a126626ae3..ae12a027f7 100644
--- a/tests/session/extract_hostname_test.php
+++ b/tests/session/extract_hostname_test.php
@@ -30,15 +30,15 @@ class phpbb_session_extract_hostname_test extends phpbb_database_test_case
 		return array (
 			// [Input] $host, $server_name_config, $cookie_domain_config, [Expected] $output
 			// If host is ip use that 	ipv4
-			array("127.0.0.1", "skipped.org", "skipped.org", "127.0.0.1"),
+			array('127.0.0.1', 'skipped.org', 'skipped.org', '127.0.0.1'),
 			// If no host but server name matches cookie_domain use that
-			array("", "example.org", "example.org", "example.org"),
+			array('', 'example.org', 'example.org', 'example.org'),
 			// If there is a host uri use that
-			array("example.org", False, False, "example.org"),
-			// "best approach" guessing
-			array("", "example.org", False, "example.org"),
-			array("", False, "127.0.0.1", "127.0.0.1"),
-			array("", False, False, php_uname('n')),
+			array('example.org', false, false, 'example.org'),
+			// 'best approach' guessing
+			array('', 'example.org', false, 'example.org'),
+			array('', false, '127.0.0.1', '127.0.0.1'),
+			array('', false, false, php_uname('n')),
 		);
 	}
 
-- 
cgit v1.2.1


From e8facfc735ccc10fd106a169e2508b4c335a0e9e Mon Sep 17 00:00:00 2001
From: Andy Chase <asperous2@gmail.com>
Date: Mon, 1 Jul 2013 15:09:13 -0700
Subject: [ticket/11620] Add commas in extract_page_test

PHPBB3-11620
---
 tests/session/extract_page_test.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/session/extract_page_test.php b/tests/session/extract_page_test.php
index 24fcb98164..94ed96c6d2 100644
--- a/tests/session/extract_page_test.php
+++ b/tests/session/extract_page_test.php
@@ -29,7 +29,7 @@ class phpbb_session_extract_page_test extends phpbb_database_test_case
 					'script_path' => '/phpBB/',
 					'root_script_path' => '/phpBB/',
 					'page' => 'index.php',
-					'forum' => 0
+					'forum' => 0,
 				)
 			) ,
 			array(
@@ -44,7 +44,7 @@ class phpbb_session_extract_page_test extends phpbb_database_test_case
 					'script_path' => '/phpBB/',
 					'root_script_path' => '/phpBB/',
 					'page' => 'ucp.php?mode=login',
-					'forum' => 0
+					'forum' => 0,
 				)
 			) ,
 			array(
@@ -59,7 +59,7 @@ class phpbb_session_extract_page_test extends phpbb_database_test_case
 					'script_path' => '/phpBB/',
 					'root_script_path' => '/phpBB/',
 					'page' => 'ucp.php?mode=register',
-					'forum' => 0
+					'forum' => 0,
 				)
 			) ,
 			array(
@@ -74,7 +74,7 @@ class phpbb_session_extract_page_test extends phpbb_database_test_case
 					'script_path' => '/phpBB/',
 					'root_script_path' => '/phpBB/',
 					'page' => 'ucp.php?mode=register',
-					'forum' => 0
+					'forum' => 0,
 				)
 			) ,
 			array(
@@ -90,7 +90,7 @@ class phpbb_session_extract_page_test extends phpbb_database_test_case
 					'script_path' => '/phpBB/adm/',
 					'root_script_path' => '/phpBB/',
 					//'page' => 'adm/index.php',
-					'forum' => 0
+					'forum' => 0,
 				)
 			)
 		);
-- 
cgit v1.2.1


From 2f92c903e7f42978e01d09287e93d572f5e302c9 Mon Sep 17 00:00:00 2001
From: Andy Chase <asperous2@gmail.com>
Date: Mon, 1 Jul 2013 15:16:22 -0700
Subject: [ticket/11620] Make testable_facade non-static, expand.

Make the class functions of testable_facade no longer static methods,
but a class based one and expand the methods to be filled in, in later commits.

PHPBB3-11620
---
 tests/session/extract_hostname_test.php |   5 +-
 tests/session/extract_page_test.php     |   7 +-
 tests/session/testable_facade.php       | 145 +++++++++++++++++++++++++++-----
 3 files changed, 132 insertions(+), 25 deletions(-)

diff --git a/tests/session/extract_hostname_test.php b/tests/session/extract_hostname_test.php
index ae12a027f7..6978b5286f 100644
--- a/tests/session/extract_hostname_test.php
+++ b/tests/session/extract_hostname_test.php
@@ -13,6 +13,7 @@ class phpbb_session_extract_hostname_test extends phpbb_database_test_case
 {
 	public $session_factory;
 	public $db;
+	public $session_facade;
 
 	public function getDataSet()
 	{
@@ -23,6 +24,8 @@ class phpbb_session_extract_hostname_test extends phpbb_database_test_case
 	{
 		$this->session_factory = new phpbb_session_testable_factory;
 		$this->db = $this->new_dbal();
+		$this->session_facade =
+			new phpbb_session_testable_facade($this->db, $this->session_factory);
 	}
 
 	static public function extract_current_hostname_data()
@@ -45,7 +48,7 @@ class phpbb_session_extract_hostname_test extends phpbb_database_test_case
 	/** @dataProvider extract_current_hostname_data */
 	function test_extract_current_hostname($host, $server_name_config, $cookie_domain_config, $expected)
 	{
-		$output = phpbb_session_testable_facade::extract_current_hostname(
+		$output = $this->session_facade->extract_current_hostname(
 			$this->db,
 			$this->session_factory,
 			$host,
diff --git a/tests/session/extract_page_test.php b/tests/session/extract_page_test.php
index 94ed96c6d2..f8883dc8c9 100644
--- a/tests/session/extract_page_test.php
+++ b/tests/session/extract_page_test.php
@@ -13,6 +13,7 @@ class phpbb_session_extract_page_test extends phpbb_database_test_case
 {
 	public $session_factory;
 	public $db;
+	public $session_facade;
 
 	static public function extract_current_page_data()
 	{
@@ -105,14 +106,14 @@ class phpbb_session_extract_page_test extends phpbb_database_test_case
 	{
 		$this->session_factory = new phpbb_session_testable_factory;
 		$this->db = $this->new_dbal();
+		$this->session_facade =
+			new phpbb_session_testable_facade($this->db, $this->session_factory);
 	}
 
 	/** @dataProvider extract_current_page_data */
 	function test_extract_current_page($root_path, $php_self, $query_string, $request_uri, $expected)
 	{
-		$output = phpbb_session_testable_facade::extract_current_page(
-			$this->db,
-			$this->session_factory,
+		$output = $this->session_facade->extract_current_page(
 			$root_path,
 			$php_self,
 			$query_string,
diff --git a/tests/session/testable_facade.php b/tests/session/testable_facade.php
index a4a3d63ed4..6d2c1408c9 100644
--- a/tests/session/testable_facade.php
+++ b/tests/session/testable_facade.php
@@ -14,16 +14,32 @@ require_once dirname(__FILE__) . '/../../phpBB/includes/session.php';
  * This class exists to expose session.php's functions in a more testable way.
  *
  * Since many functions in session.php have global variables inside the function,
- * this exposes those functions through a testable facade that uses testable_factory's
- * mock global variables to modify global variables used in the functions.
+ * this exposes those functions through a testable facade that uses 
+ * testable_factory's mock global variables to modify global variables used in 
+ * the functions.
  *
- * This is using the facade pattern to provide a testable "front" to the functions in sessions.php.
+ * This is using the facade pattern to provide a testable "front" to the 
+ * functions in sessions.php.
  *
  */
 class phpbb_session_testable_facade
 {
-	public static function extract_current_page($db, $session_factory, $root_path, $php_self, $query_string, $request_uri) {
-		$session_factory->get_session($db);
+	var $db;
+	var $session_factory;
+
+	function __construct($db, $session_factory) {
+		$this->db = $db;
+		$this->session_factory = $session_factory;
+	}
+
+	function extract_current_page (
+		$root_path,
+		$php_self, 
+		$query_string,
+		$request_uri
+	) 
+	{
+		$this->session_factory->get_session($this->db);
 		global $request;
 		$request->overwrite('PHP_SELF', $php_self, phpbb_request_interface::SERVER);
 		$request->overwrite('QUERY_STRING', $query_string, phpbb_request_interface::SERVER);
@@ -31,28 +47,115 @@ class phpbb_session_testable_facade
 		return phpbb_session::extract_current_page($root_path);
 	}
 
-	public static function extract_current_hostname($db, $session_factory, $host, $server_name_config, $cookie_domain_config) {
-		$session = $session_factory->get_session($db);
+	function extract_current_hostname (
+		$host,
+		$server_name_config,
+		$cookie_domain_config
+	)
+	{
+		$session = $this->session_factory->get_session($this->db);
 		global $config, $request;
 		$config['server_name'] = $server_name_config;
 		$config['cookie_domain'] = $cookie_domain_config;
 		$request->overwrite('SERVER_NAME', $host, phpbb_request_interface::SERVER);
 		$request->overwrite('Host', $host, phpbb_request_interface::SERVER);
-		// Note: There is a php_uname fallthrough in this method that this function doesn't override
+		// Note: There is a php_uname fallthrough in this method
+		//       that this function doesn't override
 		return $session->extract_current_hostname();
 	}
-	// [To be completed]
-	// public static function session_begin($update_session_page = true) {}
-	// public static function session_create($user_id = false, $set_admin = false, $persist_login = false, $viewonline = true) {}
-	// public static function session_kill($new_session = true) {}
-	// public static function session_gc() {}
-	// public static function set_cookie($name, $cookiedata, $cookietime) {}
-	// public static function check_ban($user_id = false, $user_ips = false, $user_email = false, $return = false) {}
-	// public static function check_dnsbl($mode, $ip = false) {}
-	// public static function set_login_key($user_id = false, $key = false, $user_ip = false) {}
-	// public static function reset_login_keys($user_id = false) {}
-	// public static function validate_referer($check_script_path = false) {}
-	// public static function update_session($session_data, $session_id = null) {}
-	// public static function unset_admin() {}
+
+
+	/** This function has a *lot* of dependencies, so instead of naming them all,
+	 * just ask for overrides */
+	function session_begin (
+		$update_session_page = true,
+		$config_overrides = array(),
+		$request_overrides = array()
+	)
+	{
+		$session = $this->session_factory->get_session($this->db);
+		global $config, $request;
+		$request->merge(phpbb_request_interface::SERVER, $request_overrides);
+		$config = array_merge($config, $config_overrides);
+		return $session->session_begin($update_session_page);
+	}
+
+	function session_create (
+		$user_id = false,
+		$set_admin = false,
+		$persist_login = false,
+		$viewonline = true,
+		$config_overrides = array(),
+		$request_overrides = array(),
+		$bot_overrides = array(),
+		$uri_sid = ""
+	)
+	{
+		$session = $this->session_factory->get_session($this->db);
+		global $config, $request, $cache;
+		$request->merge(phpbb_request_interface::SERVER, $request_overrides);
+		$config = array_merge($config, $config_overrides);
+		// Bots
+		$cache->merge_cache_data(array('_bots' => $bot_overrides));
+		// Uri sid
+		$_GET['sid'] = $uri_sid;
+		return $session->session_create($user_id, $set_admin, $persist_login, $viewonline);
+	}
+
+	function session_kill($new_session = true)
+	{
+		$session = $this->session_factory->get_session($this->db);
+		global $config, $request;
+		
+	}
+	
+	function session_gc() 
+	{
+		$session = $this->session_factory->get_session($this->db);
+		global $config, $request;
+		
+	}
+
+	function set_cookie($name, $cookiedata, $cookietime) 
+	{
+		$session = $this->session_factory->get_session($this->db);
+		global $config, $request;
+		
+	}
+
+	function check_ban($user_id = false, $user_ips = false, $user_email = false, $return = false) 
+	{
+		$session = $this->session_factory->get_session($this->db);
+		global $config, $request;
+		
+	}
+
+	function check_dnsbl($mode, $ip = false)
+	{
+		$session = $this->session_factory->get_session($this->db);
+		global $config, $request;
+		
+	}
+
+	function set_login_key($user_id = false, $key = false, $user_ip = false) 
+	{
+		$session = $this->session_factory->get_session($this->db);
+		global $config, $request;
+		
+	}
+	
+	function reset_login_keys($user_id = false)
+	{
+		$session = $this->session_factory->get_session($this->db);
+		global $config, $request;
+
+	}
+
+	function validate_referer($check_script_path = false)
+	{
+		$session = $this->session_factory->get_session($this->db);
+		global $config, $request;
+		return $session->validate_referer($check_script_path);
+	}
 }
 
-- 
cgit v1.2.1


From 17890a308bbecd295c6ebb92d55fc39e68aae34e Mon Sep 17 00:00:00 2001
From: Andy Chase <asperous2@gmail.com>
Date: Mon, 1 Jul 2013 16:44:22 -0700
Subject: [ticket/11620] Add ipv6 test cases and remove extra arguments.

PHPBB3-11620
---
 tests/session/extract_hostname_test.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/tests/session/extract_hostname_test.php b/tests/session/extract_hostname_test.php
index 6978b5286f..cd71f82b17 100644
--- a/tests/session/extract_hostname_test.php
+++ b/tests/session/extract_hostname_test.php
@@ -32,8 +32,12 @@ class phpbb_session_extract_hostname_test extends phpbb_database_test_case
 	{
 		return array (
 			// [Input] $host, $server_name_config, $cookie_domain_config, [Expected] $output
-			// If host is ip use that 	ipv4
+			// If host is ip use that
+			//    ipv4
 			array('127.0.0.1', 'skipped.org', 'skipped.org', '127.0.0.1'),
+			//    ipv6
+			array('::1', 'skipped.org', 'skipped.org', ':'),
+			array('2002::3235:51f9', 'skipped.org', 'skipped.org', '2002::3235'),
 			// If no host but server name matches cookie_domain use that
 			array('', 'example.org', 'example.org', 'example.org'),
 			// If there is a host uri use that
@@ -49,8 +53,6 @@ class phpbb_session_extract_hostname_test extends phpbb_database_test_case
 	function test_extract_current_hostname($host, $server_name_config, $cookie_domain_config, $expected)
 	{
 		$output = $this->session_facade->extract_current_hostname(
-			$this->db,
-			$this->session_factory,
 			$host,
 			$server_name_config,
 			$cookie_domain_config
-- 
cgit v1.2.1


From 30ebc03d143aaa7e3708b84b93b2e112351e70e5 Mon Sep 17 00:00:00 2001
From: Andy Chase <asperous2@gmail.com>
Date: Wed, 3 Jul 2013 12:26:25 -0700
Subject: [ticket/11620] Remove unneeded functions from testable facade

There are functions listed in testable facade that don't have a lot of dependencies,
instead mostly just take the input and perform database functions on them.
These can be tested without a testable facade function and so will be removed.

PHPBB3-11620
---
 tests/session/testable_facade.php | 49 ---------------------------------------
 1 file changed, 49 deletions(-)

diff --git a/tests/session/testable_facade.php b/tests/session/testable_facade.php
index 6d2c1408c9..02af73174f 100644
--- a/tests/session/testable_facade.php
+++ b/tests/session/testable_facade.php
@@ -102,55 +102,6 @@ class phpbb_session_testable_facade
 		return $session->session_create($user_id, $set_admin, $persist_login, $viewonline);
 	}
 
-	function session_kill($new_session = true)
-	{
-		$session = $this->session_factory->get_session($this->db);
-		global $config, $request;
-		
-	}
-	
-	function session_gc() 
-	{
-		$session = $this->session_factory->get_session($this->db);
-		global $config, $request;
-		
-	}
-
-	function set_cookie($name, $cookiedata, $cookietime) 
-	{
-		$session = $this->session_factory->get_session($this->db);
-		global $config, $request;
-		
-	}
-
-	function check_ban($user_id = false, $user_ips = false, $user_email = false, $return = false) 
-	{
-		$session = $this->session_factory->get_session($this->db);
-		global $config, $request;
-		
-	}
-
-	function check_dnsbl($mode, $ip = false)
-	{
-		$session = $this->session_factory->get_session($this->db);
-		global $config, $request;
-		
-	}
-
-	function set_login_key($user_id = false, $key = false, $user_ip = false) 
-	{
-		$session = $this->session_factory->get_session($this->db);
-		global $config, $request;
-		
-	}
-	
-	function reset_login_keys($user_id = false)
-	{
-		$session = $this->session_factory->get_session($this->db);
-		global $config, $request;
-
-	}
-
 	function validate_referer($check_script_path = false)
 	{
 		$session = $this->session_factory->get_session($this->db);
-- 
cgit v1.2.1


From 290533a14fbcf09caf40c88c30fc39b227f110f0 Mon Sep 17 00:00:00 2001
From: Andy Chase <asperous2@gmail.com>
Date: Wed, 3 Jul 2013 12:28:37 -0700
Subject: [ticket/11620] Add validate_referrer test

Add a test for the validate_referrer function.

PHPBB3-11620
---
 tests/session/testable_facade.php        | 16 ++++++-
 tests/session/validate_referrer_test.php | 80 ++++++++++++++++++++++++++++++++
 2 files changed, 95 insertions(+), 1 deletion(-)
 create mode 100644 tests/session/validate_referrer_test.php

diff --git a/tests/session/testable_facade.php b/tests/session/testable_facade.php
index 02af73174f..886c9b328a 100644
--- a/tests/session/testable_facade.php
+++ b/tests/session/testable_facade.php
@@ -102,10 +102,24 @@ class phpbb_session_testable_facade
 		return $session->session_create($user_id, $set_admin, $persist_login, $viewonline);
 	}
 
-	function validate_referer($check_script_path = false)
+	function validate_referer(
+		$check_script_path,
+		$referer,
+		$host,
+		$force_server_vars,
+		$server_port,
+		$server_name,
+		$root_script_path
+	)
 	{
 		$session = $this->session_factory->get_session($this->db);
 		global $config, $request;
+		$session->referer = $referer;
+		$session->page['root_script_path'] = $root_script_path;
+		$session->host = $host;
+		$config['force_server_vars'] = $force_server_vars;
+		$config['server_name'] = $server_name;
+		$request->overwrite('SERVER_PORT', $server_port, phpbb_request_interface::SERVER);
 		return $session->validate_referer($check_script_path);
 	}
 }
diff --git a/tests/session/validate_referrer_test.php b/tests/session/validate_referrer_test.php
new file mode 100644
index 0000000000..e5faf8a21f
--- /dev/null
+++ b/tests/session/validate_referrer_test.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ *
+ * @package testing
+ * @copyright (c) 2013 phpBB Group
+ * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+ *
+ */
+
+require_once dirname(__FILE__) . '/testable_facade.php';
+
+class phpbb_session_validate_referrer_test extends phpbb_database_test_case
+{
+	public $session_factory;
+	public $db;
+	public $session_facade;
+
+	public function getDataSet()
+	{
+		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/sessions_empty.xml');
+	}
+
+	public function setUp()
+	{
+		$this->session_factory = new phpbb_session_testable_factory;
+		$this->db = $this->new_dbal();
+		$this->session_facade =
+			new phpbb_session_testable_facade($this->db, $this->session_factory);
+	}
+
+	static function referrer_inputs() {
+		$ex = "example.org";
+		$alt = "example.com";
+		return array(
+		// checkpath   referrer  host    forcevars    port servername   rootpath   pass?
+		// 0 Referrer or host wasn't collected, therefore should validate
+		array(false,  "",  $ex,  false,  80, $ex,  "", true),
+		array(false,  $ex, "",   false,  80, $ex,  "", true),
+		// 2 Referrer doesn't match host or server_name
+		array(false,  $alt, $ex,   yes,  80, $ex,  "", false),
+		// 3 Everything should check out
+		array(false,  $ex, $ex,  false,    80, $ex,  "", true),
+		// 4 Check Script Path
+		array(true,  $ex, $ex,  false,    80, $ex,  "", true),
+		array(true,  "$ex/foo", $ex,  false,    80, $ex,  "/foo", true),
+		array(true,  "$ex/bar", $ex,  false,    80, $ex,  "/foo", false),
+		// 7 Port (This is not checked unless path is checked)
+		array(true,  "$ex:80/foo", "$ex:80",  false, 80, "$ex:80",  "/foo", true),
+		array(true,  "$ex:80/bar", "$ex:80",  false, 80, "$ex:80",  "/foo", false),
+		array(true,  "$ex:79/foo", "$ex:81",  false, 81, "$ex:81",  "/foo", false),
+		);
+	}
+
+	/** @dataProvider  referrer_inputs */
+	function test_failing_referrer (
+		$check_script_path,
+		$referrer,
+		$host,
+		$force_server_vars,
+		$server_port,
+		$server_name,
+		$root_script_path,
+		$pass_or_fail
+	)
+	{
+		//Referrer needs http:// because it's going to get stripped in function.
+		$referrer = ($referrer? 'http://'.$referrer : '');
+		$this->assertEquals(
+			$pass_or_fail,
+			$this->session_facade->validate_referer(
+				$check_script_path,
+				$referrer,
+				$host,
+				$force_server_vars,
+				$server_port,
+				$server_name,
+				$root_script_path
+		), "referrer should" . ($pass_or_fail? "" : "n't") . " be validated");
+	}
+}
-- 
cgit v1.2.1


From ab1c42babf5fcbc07637940bd50ba4b2d7edca81 Mon Sep 17 00:00:00 2001
From: Andy Chase <asperous2@gmail.com>
Date: Wed, 3 Jul 2013 12:41:40 -0700
Subject: [ticket/11620] Add indentation, change quote style.

indentation is probably more important than 80 characters per line apparently.
Single quotes instead of double per coding guidelines.

PHPBB3-11620
---
 tests/session/validate_referrer_test.php | 34 ++++++++++++++++----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/tests/session/validate_referrer_test.php b/tests/session/validate_referrer_test.php
index e5faf8a21f..0636f04072 100644
--- a/tests/session/validate_referrer_test.php
+++ b/tests/session/validate_referrer_test.php
@@ -32,22 +32,22 @@ class phpbb_session_validate_referrer_test extends phpbb_database_test_case
 		$ex = "example.org";
 		$alt = "example.com";
 		return array(
-		// checkpath   referrer  host    forcevars    port servername   rootpath   pass?
-		// 0 Referrer or host wasn't collected, therefore should validate
-		array(false,  "",  $ex,  false,  80, $ex,  "", true),
-		array(false,  $ex, "",   false,  80, $ex,  "", true),
-		// 2 Referrer doesn't match host or server_name
-		array(false,  $alt, $ex,   yes,  80, $ex,  "", false),
-		// 3 Everything should check out
-		array(false,  $ex, $ex,  false,    80, $ex,  "", true),
-		// 4 Check Script Path
-		array(true,  $ex, $ex,  false,    80, $ex,  "", true),
-		array(true,  "$ex/foo", $ex,  false,    80, $ex,  "/foo", true),
-		array(true,  "$ex/bar", $ex,  false,    80, $ex,  "/foo", false),
-		// 7 Port (This is not checked unless path is checked)
-		array(true,  "$ex:80/foo", "$ex:80",  false, 80, "$ex:80",  "/foo", true),
-		array(true,  "$ex:80/bar", "$ex:80",  false, 80, "$ex:80",  "/foo", false),
-		array(true,  "$ex:79/foo", "$ex:81",  false, 81, "$ex:81",  "/foo", false),
+			// checkpath   referrer  host    forcevars    port servername   rootpath   pass?
+			// 0 Referrer or host wasn't collected, therefore should validate
+			array(false,  '',  $ex,  false,  80, $ex,  '', true),
+			array(false,  $ex, '',   false,  80, $ex,  '', true),
+			// 2 Referrer doesn't match host or server_name
+			array(false,  $alt, $ex,   yes,  80, $ex,  '', false),
+			// 3 Everything should check out
+			array(false,  $ex, $ex,  false,    80, $ex,  '', true),
+			// 4 Check Script Path
+			array(true,  $ex, $ex,  false,    80, $ex,  '', true),
+			array(true,  "$ex/foo", $ex,  false,    80, $ex,  "/foo", true),
+			array(true,  "$ex/bar", $ex,  false,    80, $ex,  "/foo", false),
+			// 7 Port (This is not checked unless path is checked)
+			array(true,  "$ex:80/foo", "$ex:80",  false, 80, "$ex:80",  "/foo", true),
+			array(true,  "$ex:80/bar", "$ex:80",  false, 80, "$ex:80",  "/foo", false),
+			array(true,  "$ex:79/foo", "$ex:81",  false, 81, "$ex:81",  "/foo", false),
 		);
 	}
 
@@ -75,6 +75,6 @@ class phpbb_session_validate_referrer_test extends phpbb_database_test_case
 				$server_port,
 				$server_name,
 				$root_script_path
-		), "referrer should" . ($pass_or_fail? "" : "n't") . " be validated");
+		), "referrer should" . ($pass_or_fail? '' : "n't") . " be validated");
 	}
 }
-- 
cgit v1.2.1


From 7ef95ce8ac8d189c65c3c3b27f0da9d1ac46877c Mon Sep 17 00:00:00 2001
From: Andy Chase <asperous2@gmail.com>
Date: Fri, 5 Jul 2013 11:52:40 -0700
Subject: [ticket/11620] Fix typo and confusingly named test

PHPBB3-11620
---
 tests/session/validate_referrer_test.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/session/validate_referrer_test.php b/tests/session/validate_referrer_test.php
index 0636f04072..6774166132 100644
--- a/tests/session/validate_referrer_test.php
+++ b/tests/session/validate_referrer_test.php
@@ -37,7 +37,7 @@ class phpbb_session_validate_referrer_test extends phpbb_database_test_case
 			array(false,  '',  $ex,  false,  80, $ex,  '', true),
 			array(false,  $ex, '',   false,  80, $ex,  '', true),
 			// 2 Referrer doesn't match host or server_name
-			array(false,  $alt, $ex,   yes,  80, $ex,  '', false),
+			array(false,  $alt, $ex,   false,  80, $ex,  '', false),
 			// 3 Everything should check out
 			array(false,  $ex, $ex,  false,    80, $ex,  '', true),
 			// 4 Check Script Path
@@ -52,7 +52,7 @@ class phpbb_session_validate_referrer_test extends phpbb_database_test_case
 	}
 
 	/** @dataProvider  referrer_inputs */
-	function test_failing_referrer (
+	function test_referrer_inputs (
 		$check_script_path,
 		$referrer,
 		$host,
-- 
cgit v1.2.1


From 521d35dd6eaf7a6cd8be1ebd8591e4b2b21fd99f Mon Sep 17 00:00:00 2001
From: Andy Chase <asperous2@gmail.com>
Date: Fri, 5 Jul 2013 13:10:27 -0700
Subject: [ticket/11620] Add create_test with test for bot detection

Added a test for the creation of a session with a simple test
for detecting whether a bot is present.

PHPBB3-11620
---
 tests/session/create_test.php     | 86 +++++++++++++++++++++++++++++++++++++++
 tests/session/testable_facade.php | 26 +++++++-----
 2 files changed, 102 insertions(+), 10 deletions(-)
 create mode 100644 tests/session/create_test.php

diff --git a/tests/session/create_test.php b/tests/session/create_test.php
new file mode 100644
index 0000000000..773b833cf8
--- /dev/null
+++ b/tests/session/create_test.php
@@ -0,0 +1,86 @@
+<?php
+/**
+ *
+ * @package testing
+ * @copyright (c) 2013 phpBB Group
+ * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+ *
+ */
+
+require_once dirname(__FILE__) . '/testable_facade.php';
+
+class phpbb_session_create_test extends phpbb_database_test_case
+{
+	public $session_factory;
+	public $db;
+	public $session_facade;
+
+	public function getDataSet()
+	{
+		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/sessions_full.xml');
+	}
+
+	public function setUp()
+	{
+		$this->session_factory = new phpbb_session_testable_factory;
+		$this->db = $this->new_dbal();
+		$this->session_facade =
+			new phpbb_session_testable_facade($this->db, $this->session_factory);
+	}
+
+	static function bot($bot_agent, $user_id, $bot_ip)
+	{
+		return array(array(
+			'bot_agent' => $bot_agent,
+			'user_id' => $user_id,
+			'bot_ip' => $bot_ip
+		));
+	}
+
+	static function create_inputs() {
+		return array(
+			array(
+				false,
+				false,
+				false,
+				false,
+				array(),
+				'user agent',
+				'127.0.0.1',
+				self::bot('user agent', 13, '127.0.0.1'),
+				'',
+				function ($test, $output) {
+					$test->assertEquals($output->data['is_bot'], true, "should be a bot");
+				}
+			)
+		);
+	}
+
+	/** @dataProvider  create_inputs */
+	function test_session_create (
+		$user_id = false,
+		$set_admin = false,
+		$persist_login = false,
+		$viewonline = true,
+		array $config_overrides = array(),
+		$user_agent = "",
+		$ip_address = "",
+		array $bot_overrides = array(),
+		$uri_sid = "",
+		$test_function
+	)
+	{
+		$output = $this->session_facade->session_create(
+			$user_id,
+			$set_admin,
+			$persist_login,
+			$viewonline,
+			$config_overrides,
+			$user_agent,
+			$ip_address,
+			$bot_overrides,
+			$uri_sid
+		);
+		$test_function($this, $output);
+	}
+}
diff --git a/tests/session/testable_facade.php b/tests/session/testable_facade.php
index 886c9b328a..33175a293b 100644
--- a/tests/session/testable_facade.php
+++ b/tests/session/testable_facade.php
@@ -85,21 +85,27 @@ class phpbb_session_testable_facade
 		$set_admin = false,
 		$persist_login = false,
 		$viewonline = true,
-		$config_overrides = array(),
-		$request_overrides = array(),
-		$bot_overrides = array(),
+		array $config_overrides = array(),
+		$user_agent,
+		$ip_address,
+		array $bot_overrides = array(),
 		$uri_sid = ""
 	)
 	{
-		$session = $this->session_factory->get_session($this->db);
-		global $config, $request, $cache;
-		$request->merge(phpbb_request_interface::SERVER, $request_overrides);
-		$config = array_merge($config, $config_overrides);
+		$this->session_factory->merge_config_data($config_overrides);
 		// Bots
-		$cache->merge_cache_data(array('_bots' => $bot_overrides));
+		$this->session_factory->merge_cache_data(array('_bots' => $bot_overrides));
+		global $request;
+		$session = $this->session_factory->get_session($this->db);
+		$session->browser = $user_agent;
+		$session->ip = $ip_address;
 		// Uri sid
-		$_GET['sid'] = $uri_sid;
-		return $session->session_create($user_id, $set_admin, $persist_login, $viewonline);
+		if ($uri_sid)
+		{
+			$_GET['sid'] = $uri_sid;
+		}
+		$session->session_create($user_id, $set_admin, $persist_login, $viewonline);
+		return $session;
 	}
 
 	function validate_referer(
-- 
cgit v1.2.1


From 6f8187f7faadc543f3e43db278cd7239e8cf7ac7 Mon Sep 17 00:00:00 2001
From: Andy Chase <asperous2@gmail.com>
Date: Fri, 5 Jul 2013 13:49:03 -0700
Subject: [ticket/11620] Reworked create_test without data provider

PHPBB3-11620
---
 tests/session/create_test.php | 53 +++++++++----------------------------------
 1 file changed, 11 insertions(+), 42 deletions(-)

diff --git a/tests/session/create_test.php b/tests/session/create_test.php
index 773b833cf8..9d77a26f17 100644
--- a/tests/session/create_test.php
+++ b/tests/session/create_test.php
@@ -37,50 +37,19 @@ class phpbb_session_create_test extends phpbb_database_test_case
 		));
 	}
 
-	static function create_inputs() {
-		return array(
-			array(
-				false,
-				false,
-				false,
-				false,
-				array(),
-				'user agent',
-				'127.0.0.1',
-				self::bot('user agent', 13, '127.0.0.1'),
-				'',
-				function ($test, $output) {
-					$test->assertEquals($output->data['is_bot'], true, "should be a bot");
-				}
-			)
-		);
-	}
-
-	/** @dataProvider  create_inputs */
-	function test_session_create (
-		$user_id = false,
-		$set_admin = false,
-		$persist_login = false,
-		$viewonline = true,
-		array $config_overrides = array(),
-		$user_agent = "",
-		$ip_address = "",
-		array $bot_overrides = array(),
-		$uri_sid = "",
-		$test_function
-	)
+	function test_bot_session ()
 	{
 		$output = $this->session_facade->session_create(
-			$user_id,
-			$set_admin,
-			$persist_login,
-			$viewonline,
-			$config_overrides,
-			$user_agent,
-			$ip_address,
-			$bot_overrides,
-			$uri_sid
+			false,
+			false,
+			false,
+			false,
+			array(),
+			'user agent',
+			'127.0.0.1',
+			self::bot('user agent', 13, '127.0.0.1'),
+			''
 		);
-		$test_function($this, $output);
+		$this->assertEquals($output->data['is_bot'], true, "should be a bot");
 	}
 }
-- 
cgit v1.2.1


From 5cdcb689df37fd7cbaaa1b5475caa830e87be318 Mon Sep 17 00:00:00 2001
From: Andy Chase <asperous2@gmail.com>
Date: Fri, 5 Jul 2013 14:49:30 -0700
Subject: [ticket/11620] Implemented a provider mock object.

Due to an auth_refactor, there is a new dependency
in session.php on phpbb_container and a provider.

For purposes of testing, implemented a simple one.

PHPBB3-11620
---
 tests/mock/provider.php            | 23 +++++++++++++++++++++++
 tests/session/testable_factory.php | 12 +++++++++++-
 2 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 tests/mock/provider.php

diff --git a/tests/mock/provider.php b/tests/mock/provider.php
new file mode 100644
index 0000000000..21ef2fc949
--- /dev/null
+++ b/tests/mock/provider.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ *
+ * @package testing
+ * @copyright (c) 2013 phpBB Group
+ * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+ *
+ */
+
+/**
+ * Mock provider class with basic functions to help test
+ * sessions.
+ */
+class phpbb_provider {
+	function autologin()
+	{
+		return array();
+	}
+	function kill()
+	{
+
+	}
+}
diff --git a/tests/session/testable_factory.php b/tests/session/testable_factory.php
index 1e2b194ece..d0d0dabbec 100644
--- a/tests/session/testable_factory.php
+++ b/tests/session/testable_factory.php
@@ -7,6 +7,9 @@
 *
 */
 
+require_once dirname(__FILE__) . '/../mock/container_builder.php';
+require_once dirname(__FILE__) . '/../mock/provider.php';
+
 /**
 * This class exists to setup an instance of phpbb's session class for testing.
 *
@@ -16,6 +19,7 @@
 */
 class phpbb_session_testable_factory
 {
+	protected $container;
 	protected $config_data;
 	protected $cache_data;
 	protected $cookies;
@@ -65,7 +69,7 @@ class phpbb_session_testable_factory
 	public function get_session(phpbb_db_driver $dbal)
 	{
 		// set up all the global variables used by session
-		global $SID, $_SID, $db, $config, $cache, $request;
+		global $SID, $_SID, $db, $config, $cache, $request, $phpbb_container;
 
 		$request = $this->request = new phpbb_mock_request(
 			array(),
@@ -83,6 +87,12 @@ class phpbb_session_testable_factory
 		$cache = $this->cache = new phpbb_mock_cache($this->get_cache_data());
 		$SID = $_SID = null;
 
+		$phpbb_container = $this->container = new phpbb_mock_container_builder();
+		$phpbb_container->set(
+			'auth.provider.db',
+			new phpbb_provider()
+		);
+
 		$session = new phpbb_mock_session_testable;
 		return $session;
 	}
-- 
cgit v1.2.1


From a1168972ff4d6e5957da08c22437244c92f9696e Mon Sep 17 00:00:00 2001
From: Andy Chase <asperous2@gmail.com>
Date: Fri, 5 Jul 2013 15:00:05 -0700
Subject: [ticket/11620] Added validate_session to provider.

PHPBB3-11620
---
 tests/mock/provider.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tests/mock/provider.php b/tests/mock/provider.php
index 21ef2fc949..1e7b4bc4ba 100644
--- a/tests/mock/provider.php
+++ b/tests/mock/provider.php
@@ -12,12 +12,19 @@
  * sessions.
  */
 class phpbb_provider {
+
 	function autologin()
 	{
 		return array();
 	}
+
 	function kill()
 	{
 
 	}
+
+	function validate_session($data)
+	{
+		return true;
+	}
 }
-- 
cgit v1.2.1


From 3999d7ec7cc0860d3f955db9088558f92d1ba497 Mon Sep 17 00:00:00 2001
From: Andy Chase <asperous2@gmail.com>
Date: Mon, 8 Jul 2013 10:28:40 -0700
Subject: [ticket/11620] More mock provider methods

The mock provider object now better matches the interface
given for providers.

PHPBB3-11620
---
 tests/mock/provider.php | 28 +++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/tests/mock/provider.php b/tests/mock/provider.php
index 1e7b4bc4ba..4d0d6fc84c 100644
--- a/tests/mock/provider.php
+++ b/tests/mock/provider.php
@@ -10,21 +10,43 @@
 /**
  * Mock provider class with basic functions to help test
  * sessions.
+ *
+ * See interface here:
+ *    includes/auth/provider/interface.php
  */
 class phpbb_provider {
 
+	function init()
+	{
+		return null;
+	}
+
+	function login($username, $password)
+	{
+		return array(
+			 'status' => "",
+			 'error_msg' => "",
+			 'user_row' => "",
+			);
+	}
+
 	function autologin()
 	{
 		return array();
 	}
 
-	function kill()
+	function acp($new)
 	{
+		return array();
+	}
 
+	function logout($data, $new_session)
+	{
+		return null;
 	}
 
-	function validate_session($data)
+	function validate_session($user)
 	{
-		return true;
+		return null;
 	}
 }
-- 
cgit v1.2.1


From cd1fe789d243e12330a049799818ed7b062ea347 Mon Sep 17 00:00:00 2001
From: Andy Chase <asperous2@gmail.com>
Date: Mon, 8 Jul 2013 16:34:46 -0700
Subject: [ticket/11620] Minor changes to tests for coding standards

PHPBB3-11620
---
 tests/session/create_test.php            |  6 +++---
 tests/session/extract_page_test.php      | 26 +++++++++++++-------------
 tests/session/testable_facade.php        | 12 ++++++++++--
 tests/session/validate_referrer_test.php |  4 ++--
 4 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/tests/session/create_test.php b/tests/session/create_test.php
index 9d77a26f17..4a7484321c 100644
--- a/tests/session/create_test.php
+++ b/tests/session/create_test.php
@@ -33,11 +33,11 @@ class phpbb_session_create_test extends phpbb_database_test_case
 		return array(array(
 			'bot_agent' => $bot_agent,
 			'user_id' => $user_id,
-			'bot_ip' => $bot_ip
+			'bot_ip' => $bot_ip,
 		));
 	}
 
-	function test_bot_session ()
+	function test_bot_session()
 	{
 		$output = $this->session_facade->session_create(
 			false,
@@ -50,6 +50,6 @@ class phpbb_session_create_test extends phpbb_database_test_case
 			self::bot('user agent', 13, '127.0.0.1'),
 			''
 		);
-		$this->assertEquals($output->data['is_bot'], true, "should be a bot");
+		$this->assertEquals($output->data['is_bot'], true, 'should be a bot');
 	}
 }
diff --git a/tests/session/extract_page_test.php b/tests/session/extract_page_test.php
index f8883dc8c9..c17845526f 100644
--- a/tests/session/extract_page_test.php
+++ b/tests/session/extract_page_test.php
@@ -15,6 +15,19 @@ class phpbb_session_extract_page_test extends phpbb_database_test_case
 	public $db;
 	public $session_facade;
 
+	public function getDataSet()
+	{
+		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/sessions_empty.xml');
+	}
+
+	public function setUp()
+	{
+		$this->session_factory = new phpbb_session_testable_factory;
+		$this->db = $this->new_dbal();
+		$this->session_facade =
+			new phpbb_session_testable_facade($this->db, $this->session_factory);
+	}
+
 	static public function extract_current_page_data()
 	{
 		return array(
@@ -97,19 +110,6 @@ class phpbb_session_extract_page_test extends phpbb_database_test_case
 		);
 	}
 
-	public function getDataSet()
-	{
-		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/sessions_empty.xml');
-	}
-
-	public function setUp()
-	{
-		$this->session_factory = new phpbb_session_testable_factory;
-		$this->db = $this->new_dbal();
-		$this->session_facade =
-			new phpbb_session_testable_facade($this->db, $this->session_factory);
-	}
-
 	/** @dataProvider extract_current_page_data */
 	function test_extract_current_page($root_path, $php_self, $query_string, $request_uri, $expected)
 	{
diff --git a/tests/session/testable_facade.php b/tests/session/testable_facade.php
index 33175a293b..d28201adc3 100644
--- a/tests/session/testable_facade.php
+++ b/tests/session/testable_facade.php
@@ -65,8 +65,16 @@ class phpbb_session_testable_facade
 	}
 
 
-	/** This function has a *lot* of dependencies, so instead of naming them all,
-	 * just ask for overrides */
+	/**
+	 *
+	 * This function has a lot of dependencies, so instead of naming them all,
+	 * just ask for overrides
+	 *
+	 * @param update_session_page Boolean of whether to set page of the session
+	 * @param config_overrides An array of overrides for the global config object
+	 * @param request_overrides An array of overrides for the global request object
+	 * @return boolean False if the user is identified, otherwise true.
+	 */
 	function session_begin (
 		$update_session_page = true,
 		$config_overrides = array(),
diff --git a/tests/session/validate_referrer_test.php b/tests/session/validate_referrer_test.php
index 6774166132..1428187f27 100644
--- a/tests/session/validate_referrer_test.php
+++ b/tests/session/validate_referrer_test.php
@@ -63,8 +63,8 @@ class phpbb_session_validate_referrer_test extends phpbb_database_test_case
 		$pass_or_fail
 	)
 	{
-		//Referrer needs http:// because it's going to get stripped in function.
-		$referrer = ($referrer? 'http://'.$referrer : '');
+		// Referrer needs http:// because it's going to get stripped in function.
+		$referrer = $referrer ? 'http://'.$referrer : '';
 		$this->assertEquals(
 			$pass_or_fail,
 			$this->session_facade->validate_referer(
-- 
cgit v1.2.1


From f51721e905af68624df422889f92a069abd7b750 Mon Sep 17 00:00:00 2001
From: Andy Chase <asperous2@gmail.com>
Date: Mon, 8 Jul 2013 16:38:53 -0700
Subject: [ticket/11620] Rename provider -> mock_auth_provider

Rename the class and file name to better match
what the class is mocking, as well as implement the
interface of that class.

PHPBB3-11620
---
 tests/mock/auth_provider.php       | 53 ++++++++++++++++++++++++++++++++++++++
 tests/mock/provider.php            | 52 -------------------------------------
 tests/session/testable_factory.php |  4 +--
 3 files changed, 55 insertions(+), 54 deletions(-)
 create mode 100644 tests/mock/auth_provider.php
 delete mode 100644 tests/mock/provider.php

diff --git a/tests/mock/auth_provider.php b/tests/mock/auth_provider.php
new file mode 100644
index 0000000000..cca7865fa2
--- /dev/null
+++ b/tests/mock/auth_provider.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ *
+ * @package testing
+ * @copyright (c) 2013 phpBB Group
+ * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+ *
+ */
+
+/**
+ * Mock provider class with basic functions to help test
+ * sessions.
+ *
+ * See interface here:
+ *    includes/auth/provider/interface.php
+ */
+class phpbb_mock_auth_provider implements phpbb_auth_provider_interface
+{
+
+	function init()
+	{
+		return null;
+	}
+
+	function login($username, $password)
+	{
+		return array(
+			 'status' => "",
+			 'error_msg' => "",
+			 'user_row' => "",
+			);
+	}
+
+	function autologin()
+	{
+		return array();
+	}
+
+	function acp($new)
+	{
+		return array();
+	}
+
+	function logout($data, $new_session)
+	{
+		return null;
+	}
+
+	function validate_session($user)
+	{
+		return null;
+	}
+}
diff --git a/tests/mock/provider.php b/tests/mock/provider.php
deleted file mode 100644
index 4d0d6fc84c..0000000000
--- a/tests/mock/provider.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/**
- *
- * @package testing
- * @copyright (c) 2013 phpBB Group
- * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
- *
- */
-
-/**
- * Mock provider class with basic functions to help test
- * sessions.
- *
- * See interface here:
- *    includes/auth/provider/interface.php
- */
-class phpbb_provider {
-
-	function init()
-	{
-		return null;
-	}
-
-	function login($username, $password)
-	{
-		return array(
-			 'status' => "",
-			 'error_msg' => "",
-			 'user_row' => "",
-			);
-	}
-
-	function autologin()
-	{
-		return array();
-	}
-
-	function acp($new)
-	{
-		return array();
-	}
-
-	function logout($data, $new_session)
-	{
-		return null;
-	}
-
-	function validate_session($user)
-	{
-		return null;
-	}
-}
diff --git a/tests/session/testable_factory.php b/tests/session/testable_factory.php
index d0d0dabbec..ace968eb43 100644
--- a/tests/session/testable_factory.php
+++ b/tests/session/testable_factory.php
@@ -8,7 +8,7 @@
 */
 
 require_once dirname(__FILE__) . '/../mock/container_builder.php';
-require_once dirname(__FILE__) . '/../mock/provider.php';
+require_once dirname(__FILE__) . '/../mock/auth_provider.php';
 
 /**
 * This class exists to setup an instance of phpbb's session class for testing.
@@ -90,7 +90,7 @@ class phpbb_session_testable_factory
 		$phpbb_container = $this->container = new phpbb_mock_container_builder();
 		$phpbb_container->set(
 			'auth.provider.db',
-			new phpbb_provider()
+			new phpbb_mock_auth_provider()
 		);
 
 		$session = new phpbb_mock_session_testable;
-- 
cgit v1.2.1


From c96b0b1a47cef409fecc3bd30792e0907a869baa Mon Sep 17 00:00:00 2001
From: Andy Chase <asperous2@gmail.com>
Date: Tue, 9 Jul 2013 12:03:17 -0700
Subject: [ticket/11620] Removed unnecessary lines and whitespace

PHPBB3-11620
---
 tests/mock/auth_provider.php      | 7 +------
 tests/session/testable_facade.php | 7 +++----
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/tests/mock/auth_provider.php b/tests/mock/auth_provider.php
index cca7865fa2..9674c573e3 100644
--- a/tests/mock/auth_provider.php
+++ b/tests/mock/auth_provider.php
@@ -8,15 +8,10 @@
  */
 
 /**
- * Mock provider class with basic functions to help test
- * sessions.
- *
- * See interface here:
- *    includes/auth/provider/interface.php
+ * Mock auth provider class with basic functions to help test sessions.
  */
 class phpbb_mock_auth_provider implements phpbb_auth_provider_interface
 {
-
 	function init()
 	{
 		return null;
diff --git a/tests/session/testable_facade.php b/tests/session/testable_facade.php
index d28201adc3..b9f61b80cb 100644
--- a/tests/session/testable_facade.php
+++ b/tests/session/testable_facade.php
@@ -24,8 +24,8 @@ require_once dirname(__FILE__) . '/../../phpBB/includes/session.php';
  */
 class phpbb_session_testable_facade
 {
-	var $db;
-	var $session_factory;
+	protected $db;
+	protected $session_factory;
 
 	function __construct($db, $session_factory) {
 		$this->db = $db;
@@ -59,12 +59,11 @@ class phpbb_session_testable_facade
 		$config['cookie_domain'] = $cookie_domain_config;
 		$request->overwrite('SERVER_NAME', $host, phpbb_request_interface::SERVER);
 		$request->overwrite('Host', $host, phpbb_request_interface::SERVER);
-		// Note: There is a php_uname fallthrough in this method
+		// Note: There is a php_uname function used as a fallthrough
 		//       that this function doesn't override
 		return $session->extract_current_hostname();
 	}
 
-
 	/**
 	 *
 	 * This function has a lot of dependencies, so instead of naming them all,
-- 
cgit v1.2.1


From 1d55709e1336e826aa514ecb84c8c98c52e500c7 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Fri, 12 Jul 2013 12:56:00 -0500
Subject: [ticket/11667] includeasset should be abstract

PHPBB3-11667
---
 phpBB/includes/template/twig/node/includeasset.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/includes/template/twig/node/includeasset.php b/phpBB/includes/template/twig/node/includeasset.php
index 5abff10e3f..38c0498492 100644
--- a/phpBB/includes/template/twig/node/includeasset.php
+++ b/phpBB/includes/template/twig/node/includeasset.php
@@ -7,7 +7,7 @@
 *
 */
 
-class phpbb_template_twig_node_includeasset extends Twig_Node
+abstract class phpbb_template_twig_node_includeasset extends Twig_Node
 {
 	/** @var Twig_Environment */
 	protected $environment;
-- 
cgit v1.2.1


From 41d8bfa974900c9befbde06cc08060eb8a552ec8 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Fri, 12 Jul 2013 13:32:40 -0500
Subject: [ticket/11667] Make functions abstract in includeasset

Also comment properly

PHPBB3-11667
---
 phpBB/includes/template/twig/node/includeasset.php | 15 +++++++++++++++
 phpBB/includes/template/twig/node/includecss.php   | 14 ++++++++++----
 phpBB/includes/template/twig/node/includejs.php    | 14 ++++++++++----
 3 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/phpBB/includes/template/twig/node/includeasset.php b/phpBB/includes/template/twig/node/includeasset.php
index 38c0498492..b12d379157 100644
--- a/phpBB/includes/template/twig/node/includeasset.php
+++ b/phpBB/includes/template/twig/node/includeasset.php
@@ -62,4 +62,19 @@ abstract class phpbb_template_twig_node_includeasset extends Twig_Node
 			->raw("\n');\n")
 		;
 	}
+
+	/**
+	* Get the definition name
+	*
+	* @return string (e.g. 'SCRIPTS')
+	*/
+	abstract public function get_definition_name();
+
+	/**
+	* Append the output code for the asset
+	*
+	* @param Twig_Compiler A Twig_Compiler instance
+	* @return null
+	*/
+	abstract protected function append_asset(Twig_Compiler $compiler);
 }
diff --git a/phpBB/includes/template/twig/node/includecss.php b/phpBB/includes/template/twig/node/includecss.php
index 01fda44aad..450edb3e1e 100644
--- a/phpBB/includes/template/twig/node/includecss.php
+++ b/phpBB/includes/template/twig/node/includecss.php
@@ -9,16 +9,22 @@
 
 class phpbb_template_twig_node_includecss extends phpbb_template_twig_node_includeasset
 {
+	/**
+	* Get the definition name
+	*
+	* @return string (e.g. 'SCRIPTS')
+	*/
 	public function get_definition_name()
 	{
 		return 'STYLESHEETS';
 	}
 
 	/**
-	 * Compiles the node to PHP.
-	 *
-	 * @param Twig_Compiler A Twig_Compiler instance
-	 */
+	* Append the output code for the asset
+	*
+	* @param Twig_Compiler A Twig_Compiler instance
+	* @return null
+	*/
 	public function append_asset(Twig_Compiler $compiler)
 	{
 		$compiler
diff --git a/phpBB/includes/template/twig/node/includejs.php b/phpBB/includes/template/twig/node/includejs.php
index fdf2bea3ed..50ab448e0f 100644
--- a/phpBB/includes/template/twig/node/includejs.php
+++ b/phpBB/includes/template/twig/node/includejs.php
@@ -9,16 +9,22 @@
 
 class phpbb_template_twig_node_includejs extends phpbb_template_twig_node_includeasset
 {
+	/**
+	* Get the definition name
+	*
+	* @return string (e.g. 'SCRIPTS')
+	*/
 	public function get_definition_name()
 	{
 		return 'SCRIPTS';
 	}
 
 	/**
-	 * Compiles the node to PHP.
-	 *
-	 * @param Twig_Compiler A Twig_Compiler instance
-	 */
+	* Append the output code for the asset
+	*
+	* @param Twig_Compiler A Twig_Compiler instance
+	* @return null
+	*/
 	protected function append_asset(Twig_Compiler $compiler)
 	{
 		$config = $this->environment->get_phpbb_config();
-- 
cgit v1.2.1


From 31fed4215067ee39e7396f010a06093fe66352ee Mon Sep 17 00:00:00 2001
From: Bruno Ais <brunoaiss@gmail.com>
Date: Sat, 13 Jul 2013 12:58:04 +0100
Subject: [ticket/11656] generate_text_for_display on memberlist.php

sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11656
---
 phpBB/memberlist.php | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php
index 7ecf332720..6156e6a292 100644
--- a/phpBB/memberlist.php
+++ b/phpBB/memberlist.php
@@ -561,17 +561,8 @@ switch ($mode)
 
 		if ($member['user_sig'])
 		{
-			$member['user_sig'] = censor_text($member['user_sig']);
-
-			if ($member['user_sig_bbcode_bitfield'])
-			{
-				include_once($phpbb_root_path . 'includes/bbcode.' . $phpEx);
-				$bbcode = new bbcode();
-				$bbcode->bbcode_second_pass($member['user_sig'], $member['user_sig_bbcode_uid'], $member['user_sig_bbcode_bitfield']);
-			}
-
-			$member['user_sig'] = bbcode_nl2br($member['user_sig']);
-			$member['user_sig'] = smiley_text($member['user_sig']);
+			$member['user_sig'] = generate_text_for_display($member['user_sig'], $member['user_sig_bbcode_uid'], 
+															$member['user_sig_bbcode_bitfield'], OPTION_FLAG_BBCODE || OPTION_FLAG_SMILIES, true);
 		}
 
 		$poster_avatar = phpbb_get_user_avatar($member);
-- 
cgit v1.2.1


From fca4bc53232e22233711a275e252a8006dd89e9a Mon Sep 17 00:00:00 2001
From: Bruno Ais <brunoaiss@gmail.com>
Date: Sat, 13 Jul 2013 15:55:37 +0100
Subject: [ticket/11656] Remove line break in function call

sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11656
---
 phpBB/memberlist.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php
index 6156e6a292..09b9dab5c1 100644
--- a/phpBB/memberlist.php
+++ b/phpBB/memberlist.php
@@ -561,8 +561,7 @@ switch ($mode)
 
 		if ($member['user_sig'])
 		{
-			$member['user_sig'] = generate_text_for_display($member['user_sig'], $member['user_sig_bbcode_uid'], 
-															$member['user_sig_bbcode_bitfield'], OPTION_FLAG_BBCODE || OPTION_FLAG_SMILIES, true);
+			$member['user_sig'] = generate_text_for_display($member['user_sig'], $member['user_sig_bbcode_uid'], $member['user_sig_bbcode_bitfield'], OPTION_FLAG_BBCODE || OPTION_FLAG_SMILIES, true);
 		}
 
 		$poster_avatar = phpbb_get_user_avatar($member);
-- 
cgit v1.2.1


From 402d987ccbeacb494f1147cdee047a6cf1f19f7b Mon Sep 17 00:00:00 2001
From: Bruno Ais <brunoaiss@gmail.com>
Date: Sat, 13 Jul 2013 15:56:55 +0100
Subject: [ticket/11656] Wrong bitwise OR

sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11656
---
 phpBB/memberlist.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php
index 09b9dab5c1..f8ee82084c 100644
--- a/phpBB/memberlist.php
+++ b/phpBB/memberlist.php
@@ -561,7 +561,7 @@ switch ($mode)
 
 		if ($member['user_sig'])
 		{
-			$member['user_sig'] = generate_text_for_display($member['user_sig'], $member['user_sig_bbcode_uid'], $member['user_sig_bbcode_bitfield'], OPTION_FLAG_BBCODE || OPTION_FLAG_SMILIES, true);
+			$member['user_sig'] = generate_text_for_display($member['user_sig'], $member['user_sig_bbcode_uid'], $member['user_sig_bbcode_bitfield'], OPTION_FLAG_BBCODE | OPTION_FLAG_SMILIES, true);
 		}
 
 		$poster_avatar = phpbb_get_user_avatar($member);
-- 
cgit v1.2.1


From b4fcdc51e9df126faf5e9aabcbaa50bb33da0bd0 Mon Sep 17 00:00:00 2001
From: Bruno Ais <brunoaiss@gmail.com>
Date: Sat, 13 Jul 2013 13:49:19 +0100
Subject: [ticket/11638] generate_text_for_display on viewtopic.php

lines: 835-843

sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11638
---
 phpBB/viewtopic.php | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index 4dd03202f1..6b789bbb99 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -828,26 +828,15 @@ if (!empty($topic_data['poll_start']))
 		$poll_total += $poll_option['poll_option_total'];
 	}
 
-	if ($poll_info[0]['bbcode_bitfield'])
-	{
-		$poll_bbcode = new bbcode();
-	}
-	else
-	{
-		$poll_bbcode = false;
+	$parse_bbcode_flags = OPTION_FLAG_SMILIES;
+	
+	if(empty($poll_info[0]['bbcode_bitfield'])){
+		$parse_bbcode_flags |= OPTION_FLAG_BBCODE; 
 	}
 
 	for ($i = 0, $size = sizeof($poll_info); $i < $size; $i++)
 	{
-		$poll_info[$i]['poll_option_text'] = censor_text($poll_info[$i]['poll_option_text']);
-
-		if ($poll_bbcode !== false)
-		{
-			$poll_bbcode->bbcode_second_pass($poll_info[$i]['poll_option_text'], $poll_info[$i]['bbcode_uid'], $poll_option['bbcode_bitfield']);
-		}
-
-		$poll_info[$i]['poll_option_text'] = bbcode_nl2br($poll_info[$i]['poll_option_text']);
-		$poll_info[$i]['poll_option_text'] = smiley_text($poll_info[$i]['poll_option_text']);
+		$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_bbcode_flags, true);
 	}
 
 	$topic_data['poll_title'] = censor_text($topic_data['poll_title']);
-- 
cgit v1.2.1


From 97054d81f82123f17cd3680326932a8fd021ffa2 Mon Sep 17 00:00:00 2001
From: Bruno Ais <brunoaiss@gmail.com>
Date: Sat, 13 Jul 2013 13:50:44 +0100
Subject: [ticket/11638] generate_text_for_display on viewtopic.php

lines: 846-854

sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11638
---
 phpBB/viewtopic.php | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index 6b789bbb99..d295b91f43 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -839,17 +839,9 @@ if (!empty($topic_data['poll_start']))
 		$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_bbcode_flags, true);
 	}
 
-	$topic_data['poll_title'] = censor_text($topic_data['poll_title']);
-
-	if ($poll_bbcode !== false)
-	{
-		$poll_bbcode->bbcode_second_pass($topic_data['poll_title'], $poll_info[0]['bbcode_uid'], $poll_info[0]['bbcode_bitfield']);
-	}
-
-	$topic_data['poll_title'] = bbcode_nl2br($topic_data['poll_title']);
-	$topic_data['poll_title'] = smiley_text($topic_data['poll_title']);
-
-	unset($poll_bbcode);
+	$topic_data['poll_title'] = generate_text_for_display($topic_data['poll_title'], $poll_info[0]['bbcode_uid'], $poll_info[0]['bbcode_bitfield'], $parse_bbcode_flags, true);
+	 
+	unset($parse_bbcode_flags);
 
 	foreach ($poll_info as $poll_option)
 	{
-- 
cgit v1.2.1


From a58ccdabf30cad5b0373c266fc69368c65cee1a1 Mon Sep 17 00:00:00 2001
From: Bruno Ais <brunoaiss@gmail.com>
Date: Sat, 13 Jul 2013 14:35:22 +0100
Subject: [ticket/11638] generate_text_for_display on viewtopic.php

lines: 1395-1403

sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11638
---
 phpBB/viewtopic.php | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index d295b91f43..34586b1491 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -1380,16 +1380,8 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i)
 	// End signature parsing, only if needed
 	if ($user_cache[$poster_id]['sig'] && $row['enable_sig'] && empty($user_cache[$poster_id]['sig_parsed']))
 	{
-		$user_cache[$poster_id]['sig'] = censor_text($user_cache[$poster_id]['sig']);
-
-		if ($user_cache[$poster_id]['sig_bbcode_bitfield'])
-		{
-			$bbcode->bbcode_second_pass($user_cache[$poster_id]['sig'], $user_cache[$poster_id]['sig_bbcode_uid'], $user_cache[$poster_id]['sig_bbcode_bitfield']);
-		}
-
-		$user_cache[$poster_id]['sig'] = bbcode_nl2br($user_cache[$poster_id]['sig']);
-		$user_cache[$poster_id]['sig'] = smiley_text($user_cache[$poster_id]['sig']);
-		$user_cache[$poster_id]['sig_parsed'] = true;
+		$include_bbcode_parse = $user_cache[$poster_id]['sig_bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0;
+		$user_cache[$poster_id]['sig'] = generate_text_for_display($user_cache[$poster_id]['sig'], $user_cache[$poster_id]['sig_bbcode_uid'], $user_cache[$poster_id]['sig_bbcode_bitfield'],  $include_bbcode_parse | OPTION_FLAG_SMILIES, true);
 	}
 
 	// Parse the message and subject
-- 
cgit v1.2.1


From 713a2ba573ab49d2add2522392b1f91ca3065dea Mon Sep 17 00:00:00 2001
From: Bruno Ais <brunoaiss@gmail.com>
Date: Sat, 13 Jul 2013 14:35:50 +0100
Subject: [ticket/11638] generate_text_for_display on viewtopic.php

lines: 1403-1417

sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11638
---
 phpBB/viewtopic.php | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index 34586b1491..9274539ab4 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -1385,16 +1385,7 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i)
 	}
 
 	// Parse the message and subject
-	$message = censor_text($row['post_text']);
-
-	// Second parse bbcode here
-	if ($row['bbcode_bitfield'])
-	{
-		$bbcode->bbcode_second_pass($message, $row['bbcode_uid'], $row['bbcode_bitfield']);
-	}
-
-	$message = bbcode_nl2br($message);
-	$message = smiley_text($message);
+	$message = generate_text_for_display($message, $row['bbcode_uid'], $row['bbcode_bitfield'], ($row['bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0) | OPTION_FLAG_SMILIES, true);
 
 	if (!empty($attachments[$row['post_id']]))
 	{
-- 
cgit v1.2.1


From 573987d2d2defe3425c083b093bb5a5d3ec2db2a Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 28 Jun 2013 10:52:13 +0200
Subject: [ticket/11582] Add new service for permissions

Replace calls to the language-array type with a call to get_types()

PHPBB3-11582
---
 phpBB/config/services.yml                   |   5 +
 phpBB/includes/acp/acp_permissions.php      |   9 +-
 phpBB/includes/permissions.php              | 263 ++++++++++++++++++++++++++++
 phpBB/language/en/acp/permissions_phpbb.php |  16 +-
 4 files changed, 280 insertions(+), 13 deletions(-)
 create mode 100644 phpBB/includes/permissions.php

diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml
index c1579cfb57..9337fb0a5b 100644
--- a/phpBB/config/services.yml
+++ b/phpBB/config/services.yml
@@ -8,6 +8,11 @@ imports:
     - { resource: auth_providers.yml }
 
 services:
+    acl.permissions:
+        class: phpbb_permissions
+        arguments:
+            - @dispatcher
+
     auth:
         class: phpbb_auth
 
diff --git a/phpBB/includes/acp/acp_permissions.php b/phpBB/includes/acp/acp_permissions.php
index a64765f4f5..9c5395c5b2 100644
--- a/phpBB/includes/acp/acp_permissions.php
+++ b/phpBB/includes/acp/acp_permissions.php
@@ -587,7 +587,10 @@ class acp_permissions
 	*/
 	function build_permission_dropdown($options, $default_option, $permission_scope)
 	{
-		global $user, $auth;
+		global $user, $auth, $phpbb_container;
+
+		$permissions = $phpbb_container->get('acl.permissions');
+		$permission_types = $permissions->get_types();
 
 		$s_dropdown_options = '';
 		foreach ($options as $setting)
@@ -598,8 +601,8 @@ class acp_permissions
 			}
 
 			$selected = ($setting == $default_option) ? ' selected="selected"' : '';
-			$l_setting = (isset($user->lang['permission_type'][$permission_scope][$setting])) ? $user->lang['permission_type'][$permission_scope][$setting] : $user->lang['permission_type'][$setting];
-			$s_dropdown_options .= '<option value="' . $setting . '"' . $selected . '>' . $l_setting . '</option>';
+			$l_setting = (isset($permission_types[$permission_scope][$setting])) ? $permission_types[$permission_scope][$setting] : $permission_types[$setting];
+			$s_dropdown_options .= '<option value="' . $setting . '"' . $selected . '>' . $user->lang($l_setting) . '</option>';
 		}
 
 		return $s_dropdown_options;
diff --git a/phpBB/includes/permissions.php b/phpBB/includes/permissions.php
new file mode 100644
index 0000000000..d5389344f7
--- /dev/null
+++ b/phpBB/includes/permissions.php
@@ -0,0 +1,263 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+class phpbb_permissions
+{
+	/**
+	* Event dispatcher object
+	* @var phpbb_dispatcher
+	*/
+	protected $dispatcher;
+	/**
+	* Constructor
+	*
+	* @param	phpbb_dispatcher	$phpbb_dispatcher	Event dispatcher
+	* @return	null
+	*/
+	public function __construct($phpbb_dispatcher)
+	{
+		$this->dispatcher = $phpbb_dispatcher;
+	}
+
+	public function get_categories()
+	{
+		$categories = $this->categories;
+
+		/**
+		* Allows to specify additional permission categories
+		*
+		* @event core.permissions_get_categories
+		* @var	array	categories	Array with permission categories (pm, post, settings, misc, etc.)
+		* @since 3.1-A1
+		*/
+		$vars = array('categories');
+		extract($this->dispatcher->trigger_event('core.permissions_get_categories', $vars));
+
+		return $categories;
+	}
+
+	public function get_types()
+	{
+		$types = $this->types;
+
+		/**
+		* Allows to specify additional permission types
+		*
+		* @event core.permissions_get_types
+		* @var	array	types	Array with permission types (a_, u_, m_, etc.)
+		* @since 3.1-A1
+		*/
+		$vars = array('types');
+		extract($this->dispatcher->trigger_event('core.permissions_get_types', $vars));
+
+		return $types;
+	}
+
+	public function get_permissions()
+	{
+		$permissions = $this->permissions;
+
+		/**
+		* Allows to specify additional permissions
+		*
+		* @event core.permissions_get_types
+		* @var	array	permissions		Array with permissions. Each Permission has the following layout:
+		*		'acl_<type><permission>' => array(
+		*			'lang'	=> 'Language Key with a Short description', // Optional, if not set,
+		*						// the permissions identifier 'acl_<type><permission>' is used with
+		*						// all uppercase.
+		*			'cat'	=> 'Identifier of the category, the permission should be displayed in',
+		*		),
+		*		Example:
+		*		'acl_u_viewprofile' => array(
+		*			'lang'	=> 'ACL_U_VIEWPROFILE',
+		*			'cat'	=> 'profile',
+		*		),
+		*
+		* @since 3.1-A1
+		*/
+		$vars = array('permissions');
+		extract($this->dispatcher->trigger_event('core.permissions_get_permissions', $vars));
+
+		return $permissions;
+	}
+
+	protected $types = array(
+		'u_'			=> 'ACL_TYPE_USER',
+		'a_'			=> 'ACL_TYPE_ADMIN',
+		'm_'			=> 'ACL_TYPE_MODERATOR',
+		'f_'			=> 'ACL_TYPE_FORUM',
+		'global'		=> array(
+			'm_'			=> 'ACL_TYPE_GLOBAL_MODERATOR',
+		),
+	);
+
+	protected $categories = array(
+		'actions'		=> 'Actions',
+		'content'		=> 'Content',
+		'forums'		=> 'Forums',
+		'misc'			=> 'Misc',
+		'permissions'	=> 'Permissions',
+		'pm'			=> 'Private messages',
+		'polls'			=> 'Polls',
+		'post'			=> 'Post',
+		'post_actions'	=> 'Post actions',
+		'posting'		=> 'Posting',
+		'profile'		=> 'Profile',
+		'settings'		=> 'Settings',
+		'topic_actions'	=> 'Topic actions',
+		'user_group'	=> 'Users &amp; Groups',
+	);
+
+	protected $permissions = array(
+		// User Permissions
+		'acl_u_viewprofile'	=> array('lang' => 'Can view profiles, memberlist and online list', 'cat' => 'profile'),
+		'acl_u_chgname'		=> array('lang' => 'Can change username', 'cat' => 'profile'),
+		'acl_u_chgpasswd'	=> array('lang' => 'Can change password', 'cat' => 'profile'),
+		'acl_u_chgemail'	=> array('lang' => 'Can change email address', 'cat' => 'profile'),
+		'acl_u_chgavatar'	=> array('lang' => 'Can change avatar', 'cat' => 'profile'),
+		'acl_u_chggrp'		=> array('lang' => 'Can change default usergroup', 'cat' => 'profile'),
+		'acl_u_chgprofileinfo'	=> array('lang' => 'Can change profile field information', 'cat' => 'profile'),
+
+		'acl_u_attach'		=> array('lang' => 'Can attach files', 'cat' => 'post'),
+		'acl_u_download'	=> array('lang' => 'Can download files', 'cat' => 'post'),
+		'acl_u_savedrafts'	=> array('lang' => 'Can save drafts', 'cat' => 'post'),
+		'acl_u_chgcensors'	=> array('lang' => 'Can disable word censors', 'cat' => 'post'),
+		'acl_u_sig'			=> array('lang' => 'Can use signature', 'cat' => 'post'),
+
+		'acl_u_sendpm'		=> array('lang' => 'Can send private messages', 'cat' => 'pm'),
+		'acl_u_masspm'		=> array('lang' => 'Can send messages to multiple users', 'cat' => 'pm'),
+		'acl_u_masspm_group'=> array('lang' => 'Can send messages to groups', 'cat' => 'pm'),
+		'acl_u_readpm'		=> array('lang' => 'Can read private messages', 'cat' => 'pm'),
+		'acl_u_pm_edit'		=> array('lang' => 'Can edit own private messages', 'cat' => 'pm'),
+		'acl_u_pm_delete'	=> array('lang' => 'Can remove private messages from own folder', 'cat' => 'pm'),
+		'acl_u_pm_forward'	=> array('lang' => 'Can forward private messages', 'cat' => 'pm'),
+		'acl_u_pm_emailpm'	=> array('lang' => 'Can email private messages', 'cat' => 'pm'),
+		'acl_u_pm_printpm'	=> array('lang' => 'Can print private messages', 'cat' => 'pm'),
+		'acl_u_pm_attach'	=> array('lang' => 'Can attach files in private messages', 'cat' => 'pm'),
+		'acl_u_pm_download'	=> array('lang' => 'Can download files in private messages', 'cat' => 'pm'),
+		'acl_u_pm_bbcode'	=> array('lang' => 'Can use BBCode in private messages', 'cat' => 'pm'),
+		'acl_u_pm_smilies'	=> array('lang' => 'Can use smilies in private messages', 'cat' => 'pm'),
+		'acl_u_pm_img'		=> array('lang' => 'Can use [img] BBCode tag in private messages', 'cat' => 'pm'),
+		'acl_u_pm_flash'	=> array('lang' => 'Can use [flash] BBCode tag in private messages', 'cat' => 'pm'),
+
+		'acl_u_sendemail'	=> array('lang' => 'Can send emails', 'cat' => 'misc'),
+		'acl_u_sendim'		=> array('lang' => 'Can send instant messages', 'cat' => 'misc'),
+		'acl_u_ignoreflood'	=> array('lang' => 'Can ignore flood limit', 'cat' => 'misc'),
+		'acl_u_hideonline'	=> array('lang' => 'Can hide online status', 'cat' => 'misc'),
+		'acl_u_viewonline'	=> array('lang' => 'Can view hidden online users', 'cat' => 'misc'),
+		'acl_u_search'		=> array('lang' => 'Can search board', 'cat' => 'misc'),
+
+		// Forum Permissions
+		'acl_f_list'		=> array('lang' => 'Can see forum', 'cat' => 'actions'),
+		'acl_f_read'		=> array('lang' => 'Can read forum', 'cat' => 'actions'),	
+		'acl_f_search'		=> array('lang' => 'Can search the forum', 'cat' => 'actions'),
+		'acl_f_subscribe'	=> array('lang' => 'Can subscribe forum', 'cat' => 'actions'),
+		'acl_f_print'		=> array('lang' => 'Can print topics', 'cat' => 'actions'),	
+		'acl_f_email'		=> array('lang' => 'Can email topics', 'cat' => 'actions'),	
+		'acl_f_bump'		=> array('lang' => 'Can bump topics', 'cat' => 'actions'),
+		'acl_f_user_lock'	=> array('lang' => 'Can lock own topics', 'cat' => 'actions'),
+		'acl_f_download'	=> array('lang' => 'Can download files', 'cat' => 'actions'),	
+		'acl_f_report'		=> array('lang' => 'Can report posts', 'cat' => 'actions'),
+
+		'acl_f_post'		=> array('lang' => 'Can start new topics', 'cat' => 'post'),
+		'acl_f_sticky'		=> array('lang' => 'Can post stickies', 'cat' => 'post'),
+		'acl_f_announce'	=> array('lang' => 'Can post announcements', 'cat' => 'post'),
+		'acl_f_reply'		=> array('lang' => 'Can reply to topics', 'cat' => 'post'),
+		'acl_f_edit'		=> array('lang' => 'Can edit own posts', 'cat' => 'post'),
+		'acl_f_delete'		=> array('lang' => 'Can delete own posts', 'cat' => 'post'),
+		'acl_f_ignoreflood' => array('lang' => 'Can ignore flood limit', 'cat' => 'post'),
+		'acl_f_postcount'	=> array('lang' => 'Increment post counter<br /><em>Please note that this setting only affects new posts.</em>', 'cat' => 'post'),
+		'acl_f_noapprove'	=> array('lang' => 'Can post without approval', 'cat' => 'post'),	
+
+		'acl_f_attach'		=> array('lang' => 'Can attach files', 'cat' => 'content'),	
+		'acl_f_icons'		=> array('lang' => 'Can use topic/post icons', 'cat' => 'content'),
+		'acl_f_bbcode'		=> array('lang' => 'Can use BBCode', 'cat' => 'content'),	
+		'acl_f_flash'		=> array('lang' => 'Can use [flash] BBCode tag', 'cat' => 'content'),
+		'acl_f_img'			=> array('lang' => 'Can use [img] BBCode tag', 'cat' => 'content'),
+		'acl_f_sigs'		=> array('lang' => 'Can use signatures', 'cat' => 'content'),
+		'acl_f_smilies'		=> array('lang' => 'Can use smilies', 'cat' => 'content'),
+
+		'acl_f_poll'		=> array('lang' => 'Can create polls', 'cat' => 'polls'),
+		'acl_f_vote'		=> array('lang' => 'Can vote in polls', 'cat' => 'polls'),
+		'acl_f_votechg'		=> array('lang' => 'Can change existing vote', 'cat' => 'polls'),
+
+		// Moderator Permissions
+		'acl_m_edit'		=> array('lang' => 'Can edit posts', 'cat' => 'post_actions'),
+		'acl_m_delete'		=> array('lang' => 'Can delete posts', 'cat' => 'post_actions'),
+		'acl_m_approve'		=> array('lang' => 'Can approve posts', 'cat' => 'post_actions'),
+		'acl_m_report'		=> array('lang' => 'Can close and delete reports', 'cat' => 'post_actions'),
+		'acl_m_chgposter'	=> array('lang' => 'Can change post author', 'cat' => 'post_actions'),
+
+		'acl_m_move'	=> array('lang' => 'Can move topics', 'cat' => 'topic_actions'),
+		'acl_m_lock'	=> array('lang' => 'Can lock topics', 'cat' => 'topic_actions'),
+		'acl_m_split'	=> array('lang' => 'Can split topics', 'cat' => 'topic_actions'),
+		'acl_m_merge'	=> array('lang' => 'Can merge topics', 'cat' => 'topic_actions'),
+
+		'acl_m_info'	=> array('lang' => 'Can view post details', 'cat' => 'misc'),
+		'acl_m_warn'	=> array('lang' => 'Can issue warnings<br /><em>This setting is only assigned globally. It is not forum based.</em>', 'cat' => 'misc'), // This moderator setting is only global (and not local)
+		'acl_m_ban'		=> array('lang' => 'Can manage bans<br /><em>This setting is only assigned globally. It is not forum based.</em>', 'cat' => 'misc'), // This moderator setting is only global (and not local)
+
+		// Admin Permissions
+		'acl_a_board'		=> array('lang' => 'Can alter board settings/check for updates', 'cat' => 'settings'),
+		'acl_a_server'		=> array('lang' => 'Can alter server/communication settings', 'cat' => 'settings'),
+		'acl_a_jabber'		=> array('lang' => 'Can alter Jabber settings', 'cat' => 'settings'),
+		'acl_a_phpinfo'		=> array('lang' => 'Can view php settings', 'cat' => 'settings'),
+
+		'acl_a_forum'		=> array('lang' => 'Can manage forums', 'cat' => 'forums'),
+		'acl_a_forumadd'	=> array('lang' => 'Can add new forums', 'cat' => 'forums'),
+		'acl_a_forumdel'	=> array('lang' => 'Can delete forums', 'cat' => 'forums'),
+		'acl_a_prune'		=> array('lang' => 'Can prune forums', 'cat' => 'forums'),
+
+		'acl_a_icons'		=> array('lang' => 'Can alter topic/post icons and smilies', 'cat' => 'posting'),
+		'acl_a_words'		=> array('lang' => 'Can alter word censors', 'cat' => 'posting'),
+		'acl_a_bbcode'		=> array('lang' => 'Can define BBCode tags', 'cat' => 'posting'),
+		'acl_a_attach'		=> array('lang' => 'Can alter attachment related settings', 'cat' => 'posting'),
+
+		'acl_a_user'		=> array('lang' => 'Can manage users<br /><em>This also includes seeing the users browser agent within the viewonline list.</em>', 'cat' => 'user_group'),
+		'acl_a_userdel'		=> array('lang' => 'Can delete/prune users', 'cat' => 'user_group'),
+		'acl_a_group'		=> array('lang' => 'Can manage groups', 'cat' => 'user_group'),
+		'acl_a_groupadd'	=> array('lang' => 'Can add new groups', 'cat' => 'user_group'),
+		'acl_a_groupdel'	=> array('lang' => 'Can delete groups', 'cat' => 'user_group'),
+		'acl_a_ranks'		=> array('lang' => 'Can manage ranks', 'cat' => 'user_group'),
+		'acl_a_profile'		=> array('lang' => 'Can manage custom profile fields', 'cat' => 'user_group'),
+		'acl_a_names'		=> array('lang' => 'Can manage disallowed names', 'cat' => 'user_group'),
+		'acl_a_ban'			=> array('lang' => 'Can manage bans', 'cat' => 'user_group'),
+
+		'acl_a_viewauth'	=> array('lang' => 'Can view permission masks', 'cat' => 'permissions'),
+		'acl_a_authgroups'	=> array('lang' => 'Can alter permissions for individual groups', 'cat' => 'permissions'),
+		'acl_a_authusers'	=> array('lang' => 'Can alter permissions for individual users', 'cat' => 'permissions'),
+		'acl_a_fauth'		=> array('lang' => 'Can alter forum permission class', 'cat' => 'permissions'),
+		'acl_a_mauth'		=> array('lang' => 'Can alter moderator permission class', 'cat' => 'permissions'),
+		'acl_a_aauth'		=> array('lang' => 'Can alter admin permission class', 'cat' => 'permissions'),
+		'acl_a_uauth'		=> array('lang' => 'Can alter user permission class', 'cat' => 'permissions'),
+		'acl_a_roles'		=> array('lang' => 'Can manage roles', 'cat' => 'permissions'),
+		'acl_a_switchperm'	=> array('lang' => 'Can use others permissions', 'cat' => 'permissions'),
+
+		'acl_a_styles'		=> array('lang' => 'Can manage styles', 'cat' => 'misc'),
+		'acl_a_extensions'	=> array('lang' => 'Can manage extensions', 'cat' => 'misc'),
+		'acl_a_viewlogs'	=> array('lang' => 'Can view logs', 'cat' => 'misc'),
+		'acl_a_clearlogs'	=> array('lang' => 'Can clear logs', 'cat' => 'misc'),
+		'acl_a_modules'		=> array('lang' => 'Can manage modules', 'cat' => 'misc'),
+		'acl_a_language'	=> array('lang' => 'Can manage language packs', 'cat' => 'misc'),
+		'acl_a_email'		=> array('lang' => 'Can send mass email', 'cat' => 'misc'),
+		'acl_a_bots'		=> array('lang' => 'Can manage bots', 'cat' => 'misc'),
+		'acl_a_reasons'		=> array('lang' => 'Can manage report/denial reasons', 'cat' => 'misc'),
+		'acl_a_backup'		=> array('lang' => 'Can backup/restore database', 'cat' => 'misc'),
+		'acl_a_search'		=> array('lang' => 'Can manage search backends and settings', 'cat' => 'misc'),
+	);
+}
diff --git a/phpBB/language/en/acp/permissions_phpbb.php b/phpBB/language/en/acp/permissions_phpbb.php
index 98679ad544..70312261a1 100644
--- a/phpBB/language/en/acp/permissions_phpbb.php
+++ b/phpBB/language/en/acp/permissions_phpbb.php
@@ -82,16 +82,12 @@ $lang = array_merge($lang, array(
 		'user_group'	=> 'Users &amp; Groups',
 	),
 
-	// With defining 'global' here we are able to specify what is printed out if the permission is within the global scope.
-	'permission_type'	=> array(
-		'u_'			=> 'User permissions',
-		'a_'			=> 'Admin permissions',
-		'm_'			=> 'Moderator permissions',
-		'f_'			=> 'Forum permissions',
-		'global'		=> array(
-			'm_'			=> 'Global moderator permissions',
-		),
-	),
+
+	'ACL_TYPE_USER'				=> 'User permissions',
+	'ACL_TYPE_ADMIN'			=> 'Admin permissions',
+	'ACL_TYPE_MODERATOR'		=> 'Moderator permissions',
+	'ACL_TYPE_FORUM'			=> 'Forum permissions',
+	'ACL_TYPE_GLOBAL_MODERATOR'	=> 'Global moderator permissions',
 ));
 
 // User Permissions
-- 
cgit v1.2.1


From e8d2a2fd8861e5ef2473aa670808dc6098aa1241 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 28 Jun 2013 11:10:33 +0200
Subject: [ticket/11582] Use new class for categories

PHPBB3-11582
---
 phpBB/includes/acp/acp_permission_roles.php |  7 +++++--
 phpBB/includes/acp/auth.php                 | 16 ++++++++++-----
 phpBB/includes/permissions.php              | 28 +++++++++++++--------------
 phpBB/language/en/acp/permissions_phpbb.php | 30 ++++++++++++++---------------
 4 files changed, 44 insertions(+), 37 deletions(-)

diff --git a/phpBB/includes/acp/acp_permission_roles.php b/phpBB/includes/acp/acp_permission_roles.php
index e830479389..8a2798a90a 100644
--- a/phpBB/includes/acp/acp_permission_roles.php
+++ b/phpBB/includes/acp/acp_permission_roles.php
@@ -456,7 +456,10 @@ class acp_permission_roles
 	*/
 	function display_auth_options($auth_options)
 	{
-		global $template, $user;
+		global $template, $user, $phpbb_container;
+
+		$permissions = $phpbb_container->get('acl.permissions');
+		$permission_categories = $permissions->get_categories();
 
 		$content_array = $categories = array();
 		$key_sort_array = array(0);
@@ -473,7 +476,7 @@ class acp_permission_roles
 		foreach ($content_array as $cat => $cat_array)
 		{
 			$template->assign_block_vars('auth', array(
-				'CAT_NAME'	=> $user->lang['permission_cat'][$cat],
+				'CAT_NAME'	=> $user->lang($permission_categories[$cat]),
 
 				'S_YES'		=> ($cat_array['S_YES'] && !$cat_array['S_NEVER'] && !$cat_array['S_NO']) ? true : false,
 				'S_NEVER'	=> ($cat_array['S_NEVER'] && !$cat_array['S_YES'] && !$cat_array['S_NO']) ? true : false,
diff --git a/phpBB/includes/acp/auth.php b/phpBB/includes/acp/auth.php
index 6b1da46a12..03cc0c1705 100644
--- a/phpBB/includes/acp/auth.php
+++ b/phpBB/includes/acp/auth.php
@@ -1100,7 +1100,10 @@ class auth_admin extends phpbb_auth
 	*/
 	function assign_cat_array(&$category_array, $tpl_cat, $tpl_mask, $ug_id, $forum_id, $show_trace = false, $s_view)
 	{
-		global $template, $user, $phpbb_admin_path, $phpEx;
+		global $template, $user, $phpbb_admin_path, $phpEx, $phpbb_container;
+
+		$permissions = $phpbb_container->get('acl.permissions');
+		$permission_categories = $permissions->get_categories();
 
 		@reset($category_array);
 		while (list($cat, $cat_array) = each($category_array))
@@ -1110,8 +1113,8 @@ class auth_admin extends phpbb_auth
 				'S_NEVER'	=> ($cat_array['S_NEVER'] && !$cat_array['S_YES'] && !$cat_array['S_NO']) ? true : false,
 				'S_NO'		=> ($cat_array['S_NO'] && !$cat_array['S_NEVER'] && !$cat_array['S_YES']) ? true : false,
 
-				'CAT_NAME'	=> $user->lang['permission_cat'][$cat])
-			);
+				'CAT_NAME'	=> $user->lang($permission_categories[$cat]),
+			));
 
 			/*	Sort permissions by name (more naturaly and user friendly than sorting by a primary key)
 			*	Commented out due to it's memory consumption and time needed
@@ -1176,7 +1179,10 @@ class auth_admin extends phpbb_auth
 	*/
 	function build_permission_array(&$permission_row, &$content_array, &$categories, $key_sort_array)
 	{
-		global $user;
+		global $user, $phpbb_container;
+
+		$permissions = $phpbb_container->get('acl.permissions');
+		$permission_categories = $permissions->get_categories();
 
 		foreach ($key_sort_array as $forum_id)
 		{
@@ -1204,7 +1210,7 @@ class auth_admin extends phpbb_auth
 				// Build our categories array
 				if (!isset($categories[$cat]))
 				{
-					$categories[$cat] = $user->lang['permission_cat'][$cat];
+					$categories[$cat] = $user->lang($permission_categories[$cat]);
 				}
 
 				// Build our content array
diff --git a/phpBB/includes/permissions.php b/phpBB/includes/permissions.php
index d5389344f7..1e2cf9e4aa 100644
--- a/phpBB/includes/permissions.php
+++ b/phpBB/includes/permissions.php
@@ -107,20 +107,20 @@ class phpbb_permissions
 	);
 
 	protected $categories = array(
-		'actions'		=> 'Actions',
-		'content'		=> 'Content',
-		'forums'		=> 'Forums',
-		'misc'			=> 'Misc',
-		'permissions'	=> 'Permissions',
-		'pm'			=> 'Private messages',
-		'polls'			=> 'Polls',
-		'post'			=> 'Post',
-		'post_actions'	=> 'Post actions',
-		'posting'		=> 'Posting',
-		'profile'		=> 'Profile',
-		'settings'		=> 'Settings',
-		'topic_actions'	=> 'Topic actions',
-		'user_group'	=> 'Users &amp; Groups',
+		'actions'		=> 'ACL_CAT_ACTIONS',
+		'content'		=> 'ACL_CAT_CONTENT',
+		'forums'		=> 'ACL_CAT_FORUMS',
+		'misc'			=> 'ACL_CAT_MISC',
+		'permissions'	=> 'ACL_CAT_PERMISSIONS',
+		'pm'			=> 'ACL_CAT_PM',
+		'polls'			=> 'ACL_CAT_POLLS',
+		'post'			=> 'ACL_CAT_POST',
+		'post_actions'	=> 'ACL_CAT_POST_ACTIONS',
+		'posting'		=> 'ACL_CAT_POSTING',
+		'profile'		=> 'ACL_CAT_PROFILE',
+		'settings'		=> 'ACL_CAT_SETTINGS',
+		'topic_actions'	=> 'ACL_CAT_TOPIC_ACTIONS',
+		'user_group'	=> 'ACL_CAT_USER_GROUP',
 	);
 
 	protected $permissions = array(
diff --git a/phpBB/language/en/acp/permissions_phpbb.php b/phpBB/language/en/acp/permissions_phpbb.php
index 70312261a1..0a669a4b8d 100644
--- a/phpBB/language/en/acp/permissions_phpbb.php
+++ b/phpBB/language/en/acp/permissions_phpbb.php
@@ -65,22 +65,20 @@ if (empty($lang) || !is_array($lang))
 
 // Define categories and permission types
 $lang = array_merge($lang, array(
-	'permission_cat'	=> array(
-		'actions'		=> 'Actions',
-		'content'		=> 'Content',
-		'forums'		=> 'Forums',
-		'misc'			=> 'Misc',
-		'permissions'	=> 'Permissions',
-		'pm'			=> 'Private messages',
-		'polls'			=> 'Polls',
-		'post'			=> 'Post',
-		'post_actions'	=> 'Post actions',
-		'posting'		=> 'Posting',
-		'profile'		=> 'Profile',
-		'settings'		=> 'Settings',
-		'topic_actions'	=> 'Topic actions',
-		'user_group'	=> 'Users &amp; Groups',
-	),
+	'ACL_CAT_ACTIONS'		=> 'Actions',
+	'ACL_CAT_CONTENT'		=> 'Content',
+	'ACL_CAT_FORUMS'		=> 'Forums',
+	'ACL_CAT_MISC'			=> 'Misc',
+	'ACL_CAT_PERMISSIONS'	=> 'Permissions',
+	'ACL_CAT_PM'			=> 'Private messages',
+	'ACL_CAT_POLLS'			=> 'Polls',
+	'ACL_CAT_POST'			=> 'Post',
+	'ACL_CAT_POST_ACTIONS'	=> 'Post actions',
+	'ACL_CAT_POSTING'		=> 'Posting',
+	'ACL_CAT_PROFILE'		=> 'Profile',
+	'ACL_CAT_SETTINGS'		=> 'Settings',
+	'ACL_CAT_TOPIC_ACTIONS'	=> 'Topic actions',
+	'ACL_CAT_USER_GROUP'	=> 'Users &amp; Groups',
 
 
 	'ACL_TYPE_USER'				=> 'User permissions',
-- 
cgit v1.2.1


From 137cec58950ad547a204a47b1e84e46fdc29139c Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 28 Jun 2013 11:16:52 +0200
Subject: [ticket/11582] Fix event dispatcher class name

PHPBB3-11582
---
 phpBB/includes/permissions.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/phpBB/includes/permissions.php b/phpBB/includes/permissions.php
index 1e2cf9e4aa..c338727fc0 100644
--- a/phpBB/includes/permissions.php
+++ b/phpBB/includes/permissions.php
@@ -19,16 +19,16 @@ class phpbb_permissions
 {
 	/**
 	* Event dispatcher object
-	* @var phpbb_dispatcher
+	* @var phpbb_event_dispatcher
 	*/
 	protected $dispatcher;
 	/**
 	* Constructor
 	*
-	* @param	phpbb_dispatcher	$phpbb_dispatcher	Event dispatcher
+	* @param	phpbb_event_dispatcher	$phpbb_dispatcher	Event dispatcher
 	* @return	null
 	*/
-	public function __construct($phpbb_dispatcher)
+	public function __construct(phpbb_event_dispatcher $phpbb_dispatcher)
 	{
 		$this->dispatcher = $phpbb_dispatcher;
 	}
-- 
cgit v1.2.1


From 7f9a1c811647c00b20cfa4f5029f6b569597cb4b Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 28 Jun 2013 11:27:38 +0200
Subject: [ticket/11582] Add event in constructor and add docs

PHPBB3-11582
---
 phpBB/config/services.yml      |   1 +
 phpBB/includes/permissions.php | 103 ++++++++++++++++++++++++-----------------
 2 files changed, 62 insertions(+), 42 deletions(-)

diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml
index 9337fb0a5b..4110f8c456 100644
--- a/phpBB/config/services.yml
+++ b/phpBB/config/services.yml
@@ -12,6 +12,7 @@ services:
         class: phpbb_permissions
         arguments:
             - @dispatcher
+            - @user
 
     auth:
         class: phpbb_auth
diff --git a/phpBB/includes/permissions.php b/phpBB/includes/permissions.php
index c338727fc0..ddeadc825b 100644
--- a/phpBB/includes/permissions.php
+++ b/phpBB/includes/permissions.php
@@ -22,59 +22,35 @@ class phpbb_permissions
 	* @var phpbb_event_dispatcher
 	*/
 	protected $dispatcher;
+
+	/**
+	* User object
+	* @var phpbb_user
+	*/
+	protected $user;
+
 	/**
 	* Constructor
 	*
 	* @param	phpbb_event_dispatcher	$phpbb_dispatcher	Event dispatcher
+	* @param	phpbb_user				$user				User Object
 	* @return	null
 	*/
-	public function __construct(phpbb_event_dispatcher $phpbb_dispatcher)
+	public function __construct(phpbb_event_dispatcher $phpbb_dispatcher, phpbb_user $user)
 	{
 		$this->dispatcher = $phpbb_dispatcher;
-	}
+		$this->user = $user;
 
-	public function get_categories()
-	{
 		$categories = $this->categories;
-
-		/**
-		* Allows to specify additional permission categories
-		*
-		* @event core.permissions_get_categories
-		* @var	array	categories	Array with permission categories (pm, post, settings, misc, etc.)
-		* @since 3.1-A1
-		*/
-		$vars = array('categories');
-		extract($this->dispatcher->trigger_event('core.permissions_get_categories', $vars));
-
-		return $categories;
-	}
-
-	public function get_types()
-	{
 		$types = $this->types;
-
-		/**
-		* Allows to specify additional permission types
-		*
-		* @event core.permissions_get_types
-		* @var	array	types	Array with permission types (a_, u_, m_, etc.)
-		* @since 3.1-A1
-		*/
-		$vars = array('types');
-		extract($this->dispatcher->trigger_event('core.permissions_get_types', $vars));
-
-		return $types;
-	}
-
-	public function get_permissions()
-	{
 		$permissions = $this->permissions;
 
 		/**
-		* Allows to specify additional permissions
+		* Allows to specify additional permission categories, types and permissions
 		*
-		* @event core.permissions_get_types
+		* @event core.permissions
+		* @var	array	types			Array with permission types (a_, u_, m_, etc.)
+		* @var	array	categories		Array with permission categories (pm, post, settings, misc, etc.)
 		* @var	array	permissions		Array with permissions. Each Permission has the following layout:
 		*		'acl_<type><permission>' => array(
 		*			'lang'	=> 'Language Key with a Short description', // Optional, if not set,
@@ -87,13 +63,56 @@ class phpbb_permissions
 		*			'lang'	=> 'ACL_U_VIEWPROFILE',
 		*			'cat'	=> 'profile',
 		*		),
-		*
 		* @since 3.1-A1
 		*/
-		$vars = array('permissions');
-		extract($this->dispatcher->trigger_event('core.permissions_get_permissions', $vars));
+		$vars = array('types', 'categories', 'permissions');
+		extract($phpbb_dispatcher->trigger_event('core.permissions', $vars));
+
+		$this->categories = $categories;
+		$this->types = $types;
+		$this->permissions = $permissions;
+	}
+
+	/**
+	* Returns an array with all the permission categories (pm, post, settings, misc, etc.)
+	*
+	* @return	array	Layout: cat-identifier => Language key
+	*/
+	public function get_categories()
+	{
+		return $this->categories;
+	}
 
-		return $permissions;
+	/**
+	* Returns an array with all the permission types (a_, u_, m_, etc.)
+	*
+	* @return	array	Layout: type-identifier => Language key
+	*/
+	public function get_types()
+	{
+		return $this->types;
+	}
+
+	/**
+	* Returns an array with all the permissions.
+	* Each Permission has the following layout:
+	*	'acl_<type><permission>' => array(
+	*		'lang'	=> 'Language Key with a Short description', // Optional, if not set,
+	*					// the permissions identifier 'acl_<type><permission>' is used with
+	*					// all uppercase.
+	*		'cat'	=> 'Identifier of the category, the permission should be displayed in',
+	*	),
+	*	Example:
+	*	'acl_u_viewprofile' => array(
+	*		'lang'	=> 'ACL_U_VIEWPROFILE',
+	*		'cat'	=> 'profile',
+	*	),
+	*
+	* @return	array
+	*/
+	public function get_permissions()
+	{
+		return $this->permissions;
 	}
 
 	protected $types = array(
-- 
cgit v1.2.1


From ce0a182c7fcd0c67020a44109440cd807bee2e82 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 28 Jun 2013 11:40:00 +0200
Subject: [ticket/11582] Add methods to return the language string

PHPBB3-11582
---
 phpBB/includes/acp/acp_permission_roles.php |  3 +--
 phpBB/includes/acp/acp_permissions.php      |  7 +++----
 phpBB/includes/acp/auth.php                 |  6 ++----
 phpBB/includes/permissions.php              | 29 +++++++++++++++++++++++++++++
 4 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/phpBB/includes/acp/acp_permission_roles.php b/phpBB/includes/acp/acp_permission_roles.php
index 8a2798a90a..2a00301543 100644
--- a/phpBB/includes/acp/acp_permission_roles.php
+++ b/phpBB/includes/acp/acp_permission_roles.php
@@ -459,7 +459,6 @@ class acp_permission_roles
 		global $template, $user, $phpbb_container;
 
 		$permissions = $phpbb_container->get('acl.permissions');
-		$permission_categories = $permissions->get_categories();
 
 		$content_array = $categories = array();
 		$key_sort_array = array(0);
@@ -476,7 +475,7 @@ class acp_permission_roles
 		foreach ($content_array as $cat => $cat_array)
 		{
 			$template->assign_block_vars('auth', array(
-				'CAT_NAME'	=> $user->lang($permission_categories[$cat]),
+				'CAT_NAME'	=> $permissions->get_lang_category($cat),
 
 				'S_YES'		=> ($cat_array['S_YES'] && !$cat_array['S_NEVER'] && !$cat_array['S_NO']) ? true : false,
 				'S_NEVER'	=> ($cat_array['S_NEVER'] && !$cat_array['S_YES'] && !$cat_array['S_NO']) ? true : false,
diff --git a/phpBB/includes/acp/acp_permissions.php b/phpBB/includes/acp/acp_permissions.php
index 9c5395c5b2..13e0f1c535 100644
--- a/phpBB/includes/acp/acp_permissions.php
+++ b/phpBB/includes/acp/acp_permissions.php
@@ -587,10 +587,9 @@ class acp_permissions
 	*/
 	function build_permission_dropdown($options, $default_option, $permission_scope)
 	{
-		global $user, $auth, $phpbb_container;
+		global $auth, $phpbb_container;
 
 		$permissions = $phpbb_container->get('acl.permissions');
-		$permission_types = $permissions->get_types();
 
 		$s_dropdown_options = '';
 		foreach ($options as $setting)
@@ -601,8 +600,8 @@ class acp_permissions
 			}
 
 			$selected = ($setting == $default_option) ? ' selected="selected"' : '';
-			$l_setting = (isset($permission_types[$permission_scope][$setting])) ? $permission_types[$permission_scope][$setting] : $permission_types[$setting];
-			$s_dropdown_options .= '<option value="' . $setting . '"' . $selected . '>' . $user->lang($l_setting) . '</option>';
+			$l_setting = $permissions->get_lang_type($setting, $permission_scope);
+			$s_dropdown_options .= '<option value="' . $setting . '"' . $selected . '>' . $l_setting . '</option>';
 		}
 
 		return $s_dropdown_options;
diff --git a/phpBB/includes/acp/auth.php b/phpBB/includes/acp/auth.php
index 03cc0c1705..7a7ccc0c50 100644
--- a/phpBB/includes/acp/auth.php
+++ b/phpBB/includes/acp/auth.php
@@ -1103,7 +1103,6 @@ class auth_admin extends phpbb_auth
 		global $template, $user, $phpbb_admin_path, $phpEx, $phpbb_container;
 
 		$permissions = $phpbb_container->get('acl.permissions');
-		$permission_categories = $permissions->get_categories();
 
 		@reset($category_array);
 		while (list($cat, $cat_array) = each($category_array))
@@ -1113,7 +1112,7 @@ class auth_admin extends phpbb_auth
 				'S_NEVER'	=> ($cat_array['S_NEVER'] && !$cat_array['S_YES'] && !$cat_array['S_NO']) ? true : false,
 				'S_NO'		=> ($cat_array['S_NO'] && !$cat_array['S_NEVER'] && !$cat_array['S_YES']) ? true : false,
 
-				'CAT_NAME'	=> $user->lang($permission_categories[$cat]),
+				'CAT_NAME'	=> $permissions->get_lang_category($cat),
 			));
 
 			/*	Sort permissions by name (more naturaly and user friendly than sorting by a primary key)
@@ -1182,7 +1181,6 @@ class auth_admin extends phpbb_auth
 		global $user, $phpbb_container;
 
 		$permissions = $phpbb_container->get('acl.permissions');
-		$permission_categories = $permissions->get_categories();
 
 		foreach ($key_sort_array as $forum_id)
 		{
@@ -1210,7 +1208,7 @@ class auth_admin extends phpbb_auth
 				// Build our categories array
 				if (!isset($categories[$cat]))
 				{
-					$categories[$cat] = $user->lang($permission_categories[$cat]);
+					$categories[$cat] = $permissions->get_lang_category($cat);
 				}
 
 				// Build our content array
diff --git a/phpBB/includes/permissions.php b/phpBB/includes/permissions.php
index ddeadc825b..f3b2ab5da0 100644
--- a/phpBB/includes/permissions.php
+++ b/phpBB/includes/permissions.php
@@ -83,6 +83,16 @@ class phpbb_permissions
 		return $this->categories;
 	}
 
+	/**
+	* Returns the language string of a permission category
+	*
+	* @return	array	Language string
+	*/
+	public function get_lang_category($category)
+	{
+		return $this->user->lang($this->categories[$category]);
+	}
+
 	/**
 	* Returns an array with all the permission types (a_, u_, m_, etc.)
 	*
@@ -93,6 +103,25 @@ class phpbb_permissions
 		return $this->types;
 	}
 
+	/**
+	* Returns the language string of a permission type
+	*
+	* @return	array	Language string
+	*/
+	public function get_lang_type($type, $scope = false)
+	{
+		if ($scope && isset($this->types[$scope][$type]))
+		{
+			$lang_key = $this->types[$scope][$type];
+		}
+		else
+		{
+			$lang_key = $this->types[$type];
+		}
+
+		return $this->user->lang($lang_key);
+	}
+
 	/**
 	* Returns an array with all the permissions.
 	* Each Permission has the following layout:
-- 
cgit v1.2.1


From 9c653341e4d747302bdde1273fd71199ca3b40ef Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sat, 6 Jul 2013 13:37:59 +0200
Subject: [ticket/11582] Use new methods and remove duplicated entries

PHPBB3-11582
---
 phpBB/includes/acp/acp_permission_roles.php | 12 ++++----
 phpBB/includes/acp/acp_permissions.php      |  9 ++++--
 phpBB/includes/acp/auth.php                 | 13 +++++----
 phpBB/includes/permissions.php              | 44 ++++++++++++++++++++++-------
 phpBB/language/en/acp/permissions_phpbb.php |  8 ------
 5 files changed, 54 insertions(+), 32 deletions(-)

diff --git a/phpBB/includes/acp/acp_permission_roles.php b/phpBB/includes/acp/acp_permission_roles.php
index 2a00301543..f7c0494a0b 100644
--- a/phpBB/includes/acp/acp_permission_roles.php
+++ b/phpBB/includes/acp/acp_permission_roles.php
@@ -306,6 +306,9 @@ class acp_permission_roles
 					trigger_error($user->lang['NO_ROLE_SELECTED'] . adm_back_link($this->u_action), E_USER_WARNING);
 				}
 
+				global $phpbb_container;
+				$phpbb_permissions = $phpbb_container->get('acl.permissions');
+
 				$template->assign_vars(array(
 					'S_EDIT'			=> true,
 
@@ -314,9 +317,8 @@ class acp_permission_roles
 
 					'ROLE_NAME'			=> $role_row['role_name'],
 					'ROLE_DESCRIPTION'	=> $role_row['role_description'],
-					'L_ACL_TYPE'		=> $user->lang['ACL_TYPE_' . strtoupper($permission_type)],
-					)
-				);
+					'L_ACL_TYPE'		=> $phpbb_permissions->get_type_lang($permission_type),
+				));
 
 				// We need to fill the auth options array with ACL_NO options ;)
 				$sql = 'SELECT auth_option_id, auth_option
@@ -458,7 +460,7 @@ class acp_permission_roles
 	{
 		global $template, $user, $phpbb_container;
 
-		$permissions = $phpbb_container->get('acl.permissions');
+		$phpbb_permissions = $phpbb_container->get('acl.permissions');
 
 		$content_array = $categories = array();
 		$key_sort_array = array(0);
@@ -475,7 +477,7 @@ class acp_permission_roles
 		foreach ($content_array as $cat => $cat_array)
 		{
 			$template->assign_block_vars('auth', array(
-				'CAT_NAME'	=> $permissions->get_lang_category($cat),
+				'CAT_NAME'	=> $phpbb_permissions->get_category_lang($cat),
 
 				'S_YES'		=> ($cat_array['S_YES'] && !$cat_array['S_NEVER'] && !$cat_array['S_NO']) ? true : false,
 				'S_NEVER'	=> ($cat_array['S_NEVER'] && !$cat_array['S_YES'] && !$cat_array['S_NO']) ? true : false,
diff --git a/phpBB/includes/acp/acp_permissions.php b/phpBB/includes/acp/acp_permissions.php
index 13e0f1c535..17c6561b65 100644
--- a/phpBB/includes/acp/acp_permissions.php
+++ b/phpBB/includes/acp/acp_permissions.php
@@ -510,9 +510,12 @@ class acp_permissions
 			trigger_error($user->lang['ONLY_FORUM_DEFINED'] . adm_back_link($this->u_action), E_USER_WARNING);
 		}
 
+		global $phpbb_container;
+		$phpbb_permissions = $phpbb_container->get('acl.permissions');
+
 		$template->assign_vars(array(
 			'S_PERMISSION_DROPDOWN'		=> (sizeof($this->permission_dropdown) > 1) ? $this->build_permission_dropdown($this->permission_dropdown, $permission_type, $permission_scope) : false,
-			'L_PERMISSION_TYPE'			=> $user->lang['ACL_TYPE_' . strtoupper($permission_type)],
+			'L_PERMISSION_TYPE'			=> $phpbb_permissions->get_type_lang($permission_type),
 
 			'U_ACTION'					=> $this->u_action,
 			'S_HIDDEN_FIELDS'			=> $s_hidden_fields)
@@ -589,7 +592,7 @@ class acp_permissions
 	{
 		global $auth, $phpbb_container;
 
-		$permissions = $phpbb_container->get('acl.permissions');
+		$phpbb_permissions = $phpbb_container->get('acl.permissions');
 
 		$s_dropdown_options = '';
 		foreach ($options as $setting)
@@ -600,7 +603,7 @@ class acp_permissions
 			}
 
 			$selected = ($setting == $default_option) ? ' selected="selected"' : '';
-			$l_setting = $permissions->get_lang_type($setting, $permission_scope);
+			$l_setting = $phpbb_permissions->get_type_lang($setting, $permission_scope);
 			$s_dropdown_options .= '<option value="' . $setting . '"' . $selected . '>' . $l_setting . '</option>';
 		}
 
diff --git a/phpBB/includes/acp/auth.php b/phpBB/includes/acp/auth.php
index 7a7ccc0c50..630deb991e 100644
--- a/phpBB/includes/acp/auth.php
+++ b/phpBB/includes/acp/auth.php
@@ -261,7 +261,8 @@ class auth_admin extends phpbb_auth
 	*/
 	function display_mask($mode, $permission_type, &$hold_ary, $user_mode = 'user', $local = false, $group_display = true)
 	{
-		global $template, $user, $db, $phpbb_root_path, $phpEx;
+		global $template, $user, $db, $phpbb_root_path, $phpEx, $phpbb_container;
+		$phpbb_permissions = $phpbb_container->get('acl.permissions');
 
 		// Define names for template loops, might be able to be set
 		$tpl_pmask = 'p_mask';
@@ -269,7 +270,7 @@ class auth_admin extends phpbb_auth
 		$tpl_category = 'category';
 		$tpl_mask = 'mask';
 
-		$l_acl_type = (isset($user->lang['ACL_TYPE_' . (($local) ? 'LOCAL' : 'GLOBAL') . '_' . strtoupper($permission_type)])) ? $user->lang['ACL_TYPE_' . (($local) ? 'LOCAL' : 'GLOBAL') . '_' . strtoupper($permission_type)] : 'ACL_TYPE_' . (($local) ? 'LOCAL' : 'GLOBAL') . '_' . strtoupper($permission_type);
+		$l_acl_type = $phpbb_permissions->get_type_lang($permission_type, (($local) ? 'local' : 'global'));
 
 		// Allow trace for viewing permissions and in user mode
 		$show_trace = ($mode == 'view' && $user_mode == 'user') ? true : false;
@@ -1102,7 +1103,7 @@ class auth_admin extends phpbb_auth
 	{
 		global $template, $user, $phpbb_admin_path, $phpEx, $phpbb_container;
 
-		$permissions = $phpbb_container->get('acl.permissions');
+		$phpbb_permissions = $phpbb_container->get('acl.permissions');
 
 		@reset($category_array);
 		while (list($cat, $cat_array) = each($category_array))
@@ -1112,7 +1113,7 @@ class auth_admin extends phpbb_auth
 				'S_NEVER'	=> ($cat_array['S_NEVER'] && !$cat_array['S_YES'] && !$cat_array['S_NO']) ? true : false,
 				'S_NO'		=> ($cat_array['S_NO'] && !$cat_array['S_NEVER'] && !$cat_array['S_YES']) ? true : false,
 
-				'CAT_NAME'	=> $permissions->get_lang_category($cat),
+				'CAT_NAME'	=> $phpbb_permissions->get_category_lang($cat),
 			));
 
 			/*	Sort permissions by name (more naturaly and user friendly than sorting by a primary key)
@@ -1180,7 +1181,7 @@ class auth_admin extends phpbb_auth
 	{
 		global $user, $phpbb_container;
 
-		$permissions = $phpbb_container->get('acl.permissions');
+		$phpbb_permissions = $phpbb_container->get('acl.permissions');
 
 		foreach ($key_sort_array as $forum_id)
 		{
@@ -1208,7 +1209,7 @@ class auth_admin extends phpbb_auth
 				// Build our categories array
 				if (!isset($categories[$cat]))
 				{
-					$categories[$cat] = $permissions->get_lang_category($cat);
+					$categories[$cat] = $phpbb_permissions->get_category_lang($cat);
 				}
 
 				// Build our content array
diff --git a/phpBB/includes/permissions.php b/phpBB/includes/permissions.php
index f3b2ab5da0..368fd7bc5f 100644
--- a/phpBB/includes/permissions.php
+++ b/phpBB/includes/permissions.php
@@ -86,9 +86,9 @@ class phpbb_permissions
 	/**
 	* Returns the language string of a permission category
 	*
-	* @return	array	Language string
+	* @return	string	Language string
 	*/
-	public function get_lang_category($category)
+	public function get_category_lang($category)
 	{
 		return $this->user->lang($this->categories[$category]);
 	}
@@ -106,18 +106,22 @@ class phpbb_permissions
 	/**
 	* Returns the language string of a permission type
 	*
-	* @return	array	Language string
+	* @return	string	Language string
 	*/
-	public function get_lang_type($type, $scope = false)
+	public function get_type_lang($type, $scope = false)
 	{
 		if ($scope && isset($this->types[$scope][$type]))
 		{
 			$lang_key = $this->types[$scope][$type];
 		}
-		else
+		else if (isset($this->types[$type]))
 		{
 			$lang_key = $this->types[$type];
 		}
+		else
+		{
+			$lang_key = 'ACL_TYPE_' . strtoupper(($scope) ? $scope . '_' . $type : $type);
+		}
 
 		return $this->user->lang($lang_key);
 	}
@@ -144,13 +148,33 @@ class phpbb_permissions
 		return $this->permissions;
 	}
 
+	/**
+	* Returns the category of a permission
+	*
+	* @return	string
+	*/
+	public function get_permission_category($permission)
+	{
+		return (isset($this->permissions[$permission]['cat'])) ? $this->permissions[$permission]['cat'] : 'misc';
+	}
+
+	/**
+	* Returns the language string of a permission
+	*
+	* @return	string	Language string
+	*/
+	public function get_permission_lang($permission)
+	{
+		return (isset($this->permissions[$permission]['lang'])) ? $this->user->lang($this->permissions[$permission]['lang']) : $this->user->lang('ACL_' . strtoupper($permission));
+	}
+
 	protected $types = array(
-		'u_'			=> 'ACL_TYPE_USER',
-		'a_'			=> 'ACL_TYPE_ADMIN',
-		'm_'			=> 'ACL_TYPE_MODERATOR',
-		'f_'			=> 'ACL_TYPE_FORUM',
+		'u_'			=> 'ACL_TYPE_U_',
+		'a_'			=> 'ACL_TYPE_A_',
+		'm_'			=> 'ACL_TYPE_M_',
+		'f_'			=> 'ACL_TYPE_F_',
 		'global'		=> array(
-			'm_'			=> 'ACL_TYPE_GLOBAL_MODERATOR',
+			'm_'			=> 'ACL_TYPE_GLOBAL_M_',
 		),
 	);
 
diff --git a/phpBB/language/en/acp/permissions_phpbb.php b/phpBB/language/en/acp/permissions_phpbb.php
index 0a669a4b8d..4f2c9067d2 100644
--- a/phpBB/language/en/acp/permissions_phpbb.php
+++ b/phpBB/language/en/acp/permissions_phpbb.php
@@ -63,7 +63,6 @@ if (empty($lang) || !is_array($lang))
 *	</code>
 */
 
-// Define categories and permission types
 $lang = array_merge($lang, array(
 	'ACL_CAT_ACTIONS'		=> 'Actions',
 	'ACL_CAT_CONTENT'		=> 'Content',
@@ -79,13 +78,6 @@ $lang = array_merge($lang, array(
 	'ACL_CAT_SETTINGS'		=> 'Settings',
 	'ACL_CAT_TOPIC_ACTIONS'	=> 'Topic actions',
 	'ACL_CAT_USER_GROUP'	=> 'Users &amp; Groups',
-
-
-	'ACL_TYPE_USER'				=> 'User permissions',
-	'ACL_TYPE_ADMIN'			=> 'Admin permissions',
-	'ACL_TYPE_MODERATOR'		=> 'Moderator permissions',
-	'ACL_TYPE_FORUM'			=> 'Forum permissions',
-	'ACL_TYPE_GLOBAL_MODERATOR'	=> 'Global moderator permissions',
 ));
 
 // User Permissions
-- 
cgit v1.2.1


From 22ba3de1a2902b09cb00748664ad2bf328f37734 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sat, 6 Jul 2013 13:52:09 +0200
Subject: [ticket/11582] Use member isntead of a new variable everytime

PHPBB3-11582
---
 phpBB/includes/acp/acp_permissions.php | 20 +++++++++-----------
 phpBB/includes/permissions.php         |  2 +-
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/phpBB/includes/acp/acp_permissions.php b/phpBB/includes/acp/acp_permissions.php
index 17c6561b65..ed7159996a 100644
--- a/phpBB/includes/acp/acp_permissions.php
+++ b/phpBB/includes/acp/acp_permissions.php
@@ -22,15 +22,18 @@ class acp_permissions
 {
 	var $u_action;
 	var $permission_dropdown;
+	protected $permissions;
 
 	function main($id, $mode)
 	{
-		global $db, $user, $auth, $template, $cache;
+		global $db, $user, $auth, $template, $cache, $phpbb_container;
 		global $config, $phpbb_root_path, $phpbb_admin_path, $phpEx;
 
 		include_once($phpbb_root_path . 'includes/functions_user.' . $phpEx);
 		include_once($phpbb_root_path . 'includes/acp/auth.' . $phpEx);
 
+		$this->permissions = $phpbb_container->get('acl.permissions');
+
 		$auth_admin = new auth_admin();
 
 		$user->add_lang('acp/permissions');
@@ -49,7 +52,7 @@ class acp_permissions
 
 			if ($user_id && isset($auth_admin->acl_options['id'][$permission]) && $auth->acl_get('a_viewauth'))
 			{
-				$this->page_title = sprintf($user->lang['TRACE_PERMISSION'], $user->lang['acl_' . $permission]['lang']);
+				$this->page_title = sprintf($user->lang['TRACE_PERMISSION'], $this->permissions->get_permission_lang($permission));
 				$this->permission_trace($user_id, $forum_id, $permission);
 				return;
 			}
@@ -510,12 +513,9 @@ class acp_permissions
 			trigger_error($user->lang['ONLY_FORUM_DEFINED'] . adm_back_link($this->u_action), E_USER_WARNING);
 		}
 
-		global $phpbb_container;
-		$phpbb_permissions = $phpbb_container->get('acl.permissions');
-
 		$template->assign_vars(array(
 			'S_PERMISSION_DROPDOWN'		=> (sizeof($this->permission_dropdown) > 1) ? $this->build_permission_dropdown($this->permission_dropdown, $permission_type, $permission_scope) : false,
-			'L_PERMISSION_TYPE'			=> $phpbb_permissions->get_type_lang($permission_type),
+			'L_PERMISSION_TYPE'			=> $this->permissions->get_type_lang($permission_type),
 
 			'U_ACTION'					=> $this->u_action,
 			'S_HIDDEN_FIELDS'			=> $s_hidden_fields)
@@ -590,9 +590,7 @@ class acp_permissions
 	*/
 	function build_permission_dropdown($options, $default_option, $permission_scope)
 	{
-		global $auth, $phpbb_container;
-
-		$phpbb_permissions = $phpbb_container->get('acl.permissions');
+		global $auth;
 
 		$s_dropdown_options = '';
 		foreach ($options as $setting)
@@ -603,7 +601,7 @@ class acp_permissions
 			}
 
 			$selected = ($setting == $default_option) ? ' selected="selected"' : '';
-			$l_setting = $phpbb_permissions->get_type_lang($setting, $permission_scope);
+			$l_setting = $this->permissions->get_type_lang($setting, $permission_scope);
 			$s_dropdown_options .= '<option value="' . $setting . '"' . $selected . '>' . $l_setting . '</option>';
 		}
 
@@ -984,7 +982,7 @@ class acp_permissions
 		$back = request_var('back', 0);
 
 		$template->assign_vars(array(
-			'PERMISSION'			=> $user->lang['acl_' . $permission]['lang'],
+			'PERMISSION'			=> $this->permissions->get_permission_lang($permission),
 			'PERMISSION_USERNAME'	=> $userdata['username'],
 			'FORUM_NAME'			=> $forum_name,
 
diff --git a/phpBB/includes/permissions.php b/phpBB/includes/permissions.php
index 368fd7bc5f..a450b12aed 100644
--- a/phpBB/includes/permissions.php
+++ b/phpBB/includes/permissions.php
@@ -165,7 +165,7 @@ class phpbb_permissions
 	*/
 	public function get_permission_lang($permission)
 	{
-		return (isset($this->permissions[$permission]['lang'])) ? $this->user->lang($this->permissions[$permission]['lang']) : $this->user->lang('ACL_' . strtoupper($permission));
+		return (isset($this->permissions['acl_' . $permission]['lang'])) ? $this->user->lang($this->permissions['acl_' . $permission]['lang']) : $this->user->lang('ACL_' . strtoupper($permission));
 	}
 
 	protected $types = array(
-- 
cgit v1.2.1


From aadff800dcadfdb21f3188feba754f0e93669781 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sat, 6 Jul 2013 13:57:58 +0200
Subject: [ticket/11582] Remove left over calls to lang['acl_*']

PHPBB3-11582
---
 phpBB/includes/acp/acp_permission_roles.php |  2 +-
 phpBB/includes/acp/auth.php                 | 18 +++++-------------
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/phpBB/includes/acp/acp_permission_roles.php b/phpBB/includes/acp/acp_permission_roles.php
index f7c0494a0b..7c972c74ba 100644
--- a/phpBB/includes/acp/acp_permission_roles.php
+++ b/phpBB/includes/acp/acp_permission_roles.php
@@ -492,7 +492,7 @@ class acp_permission_roles
 					'S_NO'		=> ($allowed == ACL_NO) ? true : false,
 
 					'FIELD_NAME'	=> $permission,
-					'PERMISSION'	=> $user->lang['acl_' . $permission]['lang'])
+					'PERMISSION'	=> $phpbb_permissions->get_permission_lang($permission)
 				);
 			}
 		}
diff --git a/phpBB/includes/acp/auth.php b/phpBB/includes/acp/auth.php
index 630deb991e..4ade9cab13 100644
--- a/phpBB/includes/acp/auth.php
+++ b/phpBB/includes/acp/auth.php
@@ -1148,8 +1148,8 @@ class auth_admin extends phpbb_auth
 						'U_TRACE'		=> ($show_trace) ? append_sid("{$phpbb_admin_path}index.$phpEx", "i=permissions&amp;mode=trace&amp;u=$ug_id&amp;f=$forum_id&amp;auth=$permission") : '',
 						'UA_TRACE'		=> ($show_trace) ? append_sid("{$phpbb_admin_path}index.$phpEx", "i=permissions&mode=trace&u=$ug_id&f=$forum_id&auth=$permission", false) : '',
 
-						'PERMISSION'	=> $user->lang['acl_' . $permission]['lang'])
-					);
+						'PERMISSION'	=> $phpbb_permissions->get_permission_lang($permission),
+					));
 				}
 				else
 				{
@@ -1166,8 +1166,8 @@ class auth_admin extends phpbb_auth
 						'U_TRACE'		=> ($show_trace) ? append_sid("{$phpbb_admin_path}index.$phpEx", "i=permissions&amp;mode=trace&amp;u=$ug_id&amp;f=$forum_id&amp;auth=$permission") : '',
 						'UA_TRACE'		=> ($show_trace) ? append_sid("{$phpbb_admin_path}index.$phpEx", "i=permissions&mode=trace&u=$ug_id&f=$forum_id&auth=$permission", false) : '',
 
-						'PERMISSION'	=> $user->lang['acl_' . $permission]['lang'])
-					);
+						'PERMISSION'	=> $phpbb_permissions->get_permission_lang($permission),
+					));
 				}
 			}
 		}
@@ -1196,15 +1196,7 @@ class auth_admin extends phpbb_auth
 			@reset($permissions);
 			while (list($permission, $auth_setting) = each($permissions))
 			{
-				if (!isset($user->lang['acl_' . $permission]))
-				{
-					$user->lang['acl_' . $permission] = array(
-						'cat'	=> 'misc',
-						'lang'	=> '{ acl_' . $permission . ' }'
-					);
-				}
-
-				$cat = $user->lang['acl_' . $permission]['cat'];
+				$cat = $phpbb_permissions->get_permission_category($permission);
 
 				// Build our categories array
 				if (!isset($categories[$cat]))
-- 
cgit v1.2.1


From 0e86c0247381b141cba53b6ab3fbdba276c521e3 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sat, 6 Jul 2013 15:55:25 +0200
Subject: [ticket/11582] Split permission language strings from logic

PHPBB3-11582
---
 phpBB/includes/permissions.php              | 252 +++++++++++++--------------
 phpBB/language/en/acp/permissions_phpbb.php | 253 +++++++++++++---------------
 2 files changed, 247 insertions(+), 258 deletions(-)

diff --git a/phpBB/includes/permissions.php b/phpBB/includes/permissions.php
index a450b12aed..4cb3356c53 100644
--- a/phpBB/includes/permissions.php
+++ b/phpBB/includes/permissions.php
@@ -197,139 +197,139 @@ class phpbb_permissions
 
 	protected $permissions = array(
 		// User Permissions
-		'acl_u_viewprofile'	=> array('lang' => 'Can view profiles, memberlist and online list', 'cat' => 'profile'),
-		'acl_u_chgname'		=> array('lang' => 'Can change username', 'cat' => 'profile'),
-		'acl_u_chgpasswd'	=> array('lang' => 'Can change password', 'cat' => 'profile'),
-		'acl_u_chgemail'	=> array('lang' => 'Can change email address', 'cat' => 'profile'),
-		'acl_u_chgavatar'	=> array('lang' => 'Can change avatar', 'cat' => 'profile'),
-		'acl_u_chggrp'		=> array('lang' => 'Can change default usergroup', 'cat' => 'profile'),
-		'acl_u_chgprofileinfo'	=> array('lang' => 'Can change profile field information', 'cat' => 'profile'),
-
-		'acl_u_attach'		=> array('lang' => 'Can attach files', 'cat' => 'post'),
-		'acl_u_download'	=> array('lang' => 'Can download files', 'cat' => 'post'),
-		'acl_u_savedrafts'	=> array('lang' => 'Can save drafts', 'cat' => 'post'),
-		'acl_u_chgcensors'	=> array('lang' => 'Can disable word censors', 'cat' => 'post'),
-		'acl_u_sig'			=> array('lang' => 'Can use signature', 'cat' => 'post'),
-
-		'acl_u_sendpm'		=> array('lang' => 'Can send private messages', 'cat' => 'pm'),
-		'acl_u_masspm'		=> array('lang' => 'Can send messages to multiple users', 'cat' => 'pm'),
-		'acl_u_masspm_group'=> array('lang' => 'Can send messages to groups', 'cat' => 'pm'),
-		'acl_u_readpm'		=> array('lang' => 'Can read private messages', 'cat' => 'pm'),
-		'acl_u_pm_edit'		=> array('lang' => 'Can edit own private messages', 'cat' => 'pm'),
-		'acl_u_pm_delete'	=> array('lang' => 'Can remove private messages from own folder', 'cat' => 'pm'),
-		'acl_u_pm_forward'	=> array('lang' => 'Can forward private messages', 'cat' => 'pm'),
-		'acl_u_pm_emailpm'	=> array('lang' => 'Can email private messages', 'cat' => 'pm'),
-		'acl_u_pm_printpm'	=> array('lang' => 'Can print private messages', 'cat' => 'pm'),
-		'acl_u_pm_attach'	=> array('lang' => 'Can attach files in private messages', 'cat' => 'pm'),
-		'acl_u_pm_download'	=> array('lang' => 'Can download files in private messages', 'cat' => 'pm'),
-		'acl_u_pm_bbcode'	=> array('lang' => 'Can use BBCode in private messages', 'cat' => 'pm'),
-		'acl_u_pm_smilies'	=> array('lang' => 'Can use smilies in private messages', 'cat' => 'pm'),
-		'acl_u_pm_img'		=> array('lang' => 'Can use [img] BBCode tag in private messages', 'cat' => 'pm'),
-		'acl_u_pm_flash'	=> array('lang' => 'Can use [flash] BBCode tag in private messages', 'cat' => 'pm'),
-
-		'acl_u_sendemail'	=> array('lang' => 'Can send emails', 'cat' => 'misc'),
-		'acl_u_sendim'		=> array('lang' => 'Can send instant messages', 'cat' => 'misc'),
-		'acl_u_ignoreflood'	=> array('lang' => 'Can ignore flood limit', 'cat' => 'misc'),
-		'acl_u_hideonline'	=> array('lang' => 'Can hide online status', 'cat' => 'misc'),
-		'acl_u_viewonline'	=> array('lang' => 'Can view hidden online users', 'cat' => 'misc'),
-		'acl_u_search'		=> array('lang' => 'Can search board', 'cat' => 'misc'),
+		'acl_u_viewprofile'	=> array('lang' => 'ACL_U_VIEWPROFILE', 'cat' => 'profile'),
+		'acl_u_chgname'		=> array('lang' => 'ACL_U_CHGNAME', 'cat' => 'profile'),
+		'acl_u_chgpasswd'	=> array('lang' => 'ACL_U_CHGPASSWD', 'cat' => 'profile'),
+		'acl_u_chgemail'	=> array('lang' => 'ACL_U_CHGEMAIL', 'cat' => 'profile'),
+		'acl_u_chgavatar'	=> array('lang' => 'ACL_U_CHGAVATAR', 'cat' => 'profile'),
+		'acl_u_chggrp'		=> array('lang' => 'ACL_U_CHGGRP', 'cat' => 'profile'),
+		'acl_u_chgprofileinfo'	=> array('lang' => 'ACL_U_CHGPROFILEINFO', 'cat' => 'profile'),
+
+		'acl_u_attach'		=> array('lang' => 'ACL_U_ATTACH', 'cat' => 'post'),
+		'acl_u_download'	=> array('lang' => 'ACL_U_DOWNLOAD', 'cat' => 'post'),
+		'acl_u_savedrafts'	=> array('lang' => 'ACL_U_SAVEDRAFTS', 'cat' => 'post'),
+		'acl_u_chgcensors'	=> array('lang' => 'ACL_U_CHGCENSORS', 'cat' => 'post'),
+		'acl_u_sig'			=> array('lang' => 'ACL_U_SIG', 'cat' => 'post'),
+
+		'acl_u_sendpm'		=> array('lang' => 'ACL_U_SENDPM', 'cat' => 'pm'),
+		'acl_u_masspm'		=> array('lang' => 'ACL_U_MASSPM', 'cat' => 'pm'),
+		'acl_u_masspm_group'=> array('lang' => 'ACL_U_MASSPM_GROUP', 'cat' => 'pm'),
+		'acl_u_readpm'		=> array('lang' => 'ACL_U_READPM', 'cat' => 'pm'),
+		'acl_u_pm_edit'		=> array('lang' => 'ACL_U_PM_EDIT', 'cat' => 'pm'),
+		'acl_u_pm_delete'	=> array('lang' => 'ACL_U_PM_DELETE', 'cat' => 'pm'),
+		'acl_u_pm_forward'	=> array('lang' => 'ACL_U_PM_FORWARD', 'cat' => 'pm'),
+		'acl_u_pm_emailpm'	=> array('lang' => 'ACL_U_PM_EMAILPM', 'cat' => 'pm'),
+		'acl_u_pm_printpm'	=> array('lang' => 'ACL_U_PM_PRINTPM', 'cat' => 'pm'),
+		'acl_u_pm_attach'	=> array('lang' => 'ACL_U_PM_ATTACH', 'cat' => 'pm'),
+		'acl_u_pm_download'	=> array('lang' => 'ACL_U_PM_DOWNLOAD', 'cat' => 'pm'),
+		'acl_u_pm_bbcode'	=> array('lang' => 'ACL_U_PM_BBCODE', 'cat' => 'pm'),
+		'acl_u_pm_smilies'	=> array('lang' => 'ACL_U_PM_SMILIES', 'cat' => 'pm'),
+		'acl_u_pm_img'		=> array('lang' => 'ACL_U_PM_IMG', 'cat' => 'pm'),
+		'acl_u_pm_flash'	=> array('lang' => 'ACL_U_PM_FLASH', 'cat' => 'pm'),
+
+		'acl_u_sendemail'	=> array('lang' => 'ACL_U_SENDEMAIL', 'cat' => 'misc'),
+		'acl_u_sendim'		=> array('lang' => 'ACL_U_SENDIM', 'cat' => 'misc'),
+		'acl_u_ignoreflood'	=> array('lang' => 'ACL_U_IGNOREFLOOD', 'cat' => 'misc'),
+		'acl_u_hideonline'	=> array('lang' => 'ACL_U_HIDEONLINE', 'cat' => 'misc'),
+		'acl_u_viewonline'	=> array('lang' => 'ACL_U_VIEWONLINE', 'cat' => 'misc'),
+		'acl_u_search'		=> array('lang' => 'ACL_U_SEARCH', 'cat' => 'misc'),
 
 		// Forum Permissions
-		'acl_f_list'		=> array('lang' => 'Can see forum', 'cat' => 'actions'),
-		'acl_f_read'		=> array('lang' => 'Can read forum', 'cat' => 'actions'),	
-		'acl_f_search'		=> array('lang' => 'Can search the forum', 'cat' => 'actions'),
-		'acl_f_subscribe'	=> array('lang' => 'Can subscribe forum', 'cat' => 'actions'),
-		'acl_f_print'		=> array('lang' => 'Can print topics', 'cat' => 'actions'),	
-		'acl_f_email'		=> array('lang' => 'Can email topics', 'cat' => 'actions'),	
-		'acl_f_bump'		=> array('lang' => 'Can bump topics', 'cat' => 'actions'),
-		'acl_f_user_lock'	=> array('lang' => 'Can lock own topics', 'cat' => 'actions'),
-		'acl_f_download'	=> array('lang' => 'Can download files', 'cat' => 'actions'),	
-		'acl_f_report'		=> array('lang' => 'Can report posts', 'cat' => 'actions'),
-
-		'acl_f_post'		=> array('lang' => 'Can start new topics', 'cat' => 'post'),
-		'acl_f_sticky'		=> array('lang' => 'Can post stickies', 'cat' => 'post'),
-		'acl_f_announce'	=> array('lang' => 'Can post announcements', 'cat' => 'post'),
-		'acl_f_reply'		=> array('lang' => 'Can reply to topics', 'cat' => 'post'),
-		'acl_f_edit'		=> array('lang' => 'Can edit own posts', 'cat' => 'post'),
-		'acl_f_delete'		=> array('lang' => 'Can delete own posts', 'cat' => 'post'),
-		'acl_f_ignoreflood' => array('lang' => 'Can ignore flood limit', 'cat' => 'post'),
-		'acl_f_postcount'	=> array('lang' => 'Increment post counter<br /><em>Please note that this setting only affects new posts.</em>', 'cat' => 'post'),
-		'acl_f_noapprove'	=> array('lang' => 'Can post without approval', 'cat' => 'post'),	
-
-		'acl_f_attach'		=> array('lang' => 'Can attach files', 'cat' => 'content'),	
-		'acl_f_icons'		=> array('lang' => 'Can use topic/post icons', 'cat' => 'content'),
-		'acl_f_bbcode'		=> array('lang' => 'Can use BBCode', 'cat' => 'content'),	
-		'acl_f_flash'		=> array('lang' => 'Can use [flash] BBCode tag', 'cat' => 'content'),
-		'acl_f_img'			=> array('lang' => 'Can use [img] BBCode tag', 'cat' => 'content'),
-		'acl_f_sigs'		=> array('lang' => 'Can use signatures', 'cat' => 'content'),
-		'acl_f_smilies'		=> array('lang' => 'Can use smilies', 'cat' => 'content'),
-
-		'acl_f_poll'		=> array('lang' => 'Can create polls', 'cat' => 'polls'),
-		'acl_f_vote'		=> array('lang' => 'Can vote in polls', 'cat' => 'polls'),
-		'acl_f_votechg'		=> array('lang' => 'Can change existing vote', 'cat' => 'polls'),
+		'acl_f_list'		=> array('lang' => 'ACL_F_LIST', 'cat' => 'actions'),
+		'acl_f_read'		=> array('lang' => 'ACL_F_READ', 'cat' => 'actions'),	
+		'acl_f_search'		=> array('lang' => 'ACL_F_SEARCH', 'cat' => 'actions'),
+		'acl_f_subscribe'	=> array('lang' => 'ACL_F_SUBSCRIBE', 'cat' => 'actions'),
+		'acl_f_print'		=> array('lang' => 'ACL_F_PRINT', 'cat' => 'actions'),	
+		'acl_f_email'		=> array('lang' => 'ACL_F_EMAIL', 'cat' => 'actions'),	
+		'acl_f_bump'		=> array('lang' => 'ACL_F_BUMP', 'cat' => 'actions'),
+		'acl_f_user_lock'	=> array('lang' => 'ACL_F_USER_LOCK', 'cat' => 'actions'),
+		'acl_f_download'	=> array('lang' => 'ACL_F_DOWNLOAD', 'cat' => 'actions'),	
+		'acl_f_report'		=> array('lang' => 'ACL_F_REPORT', 'cat' => 'actions'),
+
+		'acl_f_post'		=> array('lang' => 'ACL_F_POST', 'cat' => 'post'),
+		'acl_f_sticky'		=> array('lang' => 'ACL_F_STICKY', 'cat' => 'post'),
+		'acl_f_announce'	=> array('lang' => 'ACL_F_ANNOUNCE', 'cat' => 'post'),
+		'acl_f_reply'		=> array('lang' => 'ACL_F_REPLY', 'cat' => 'post'),
+		'acl_f_edit'		=> array('lang' => 'ACL_F_EDIT', 'cat' => 'post'),
+		'acl_f_delete'		=> array('lang' => 'ACL_F_DELETE', 'cat' => 'post'),
+		'acl_f_ignoreflood' => array('lang' => 'ACL_F_IGNOREFLOOD', 'cat' => 'post'),
+		'acl_f_postcount'	=> array('lang' => 'ACL_F_POSTCOUNT', 'cat' => 'post'),
+		'acl_f_noapprove'	=> array('lang' => 'ACL_F_NOAPPROVE', 'cat' => 'post'),	
+
+		'acl_f_attach'		=> array('lang' => 'ACL_F_ATTACH', 'cat' => 'content'),	
+		'acl_f_icons'		=> array('lang' => 'ACL_F_ICONS', 'cat' => 'content'),
+		'acl_f_bbcode'		=> array('lang' => 'ACL_F_BBCODE', 'cat' => 'content'),	
+		'acl_f_flash'		=> array('lang' => 'ACL_F_FLASH', 'cat' => 'content'),
+		'acl_f_img'			=> array('lang' => 'ACL_F_IMG', 'cat' => 'content'),
+		'acl_f_sigs'		=> array('lang' => 'ACL_F_SIGS', 'cat' => 'content'),
+		'acl_f_smilies'		=> array('lang' => 'ACL_F_SMILIES', 'cat' => 'content'),
+
+		'acl_f_poll'		=> array('lang' => 'ACL_F_POLL', 'cat' => 'polls'),
+		'acl_f_vote'		=> array('lang' => 'ACL_F_VOTE', 'cat' => 'polls'),
+		'acl_f_votechg'		=> array('lang' => 'ACL_F_VOTECHG', 'cat' => 'polls'),
 
 		// Moderator Permissions
-		'acl_m_edit'		=> array('lang' => 'Can edit posts', 'cat' => 'post_actions'),
-		'acl_m_delete'		=> array('lang' => 'Can delete posts', 'cat' => 'post_actions'),
-		'acl_m_approve'		=> array('lang' => 'Can approve posts', 'cat' => 'post_actions'),
-		'acl_m_report'		=> array('lang' => 'Can close and delete reports', 'cat' => 'post_actions'),
-		'acl_m_chgposter'	=> array('lang' => 'Can change post author', 'cat' => 'post_actions'),
+		'acl_m_edit'		=> array('lang' => 'ACL_M_EDIT', 'cat' => 'post_actions'),
+		'acl_m_delete'		=> array('lang' => 'ACL_M_DELETE', 'cat' => 'post_actions'),
+		'acl_m_approve'		=> array('lang' => 'ACL_M_APPROVE', 'cat' => 'post_actions'),
+		'acl_m_report'		=> array('lang' => 'ACL_M_REPORT', 'cat' => 'post_actions'),
+		'acl_m_chgposter'	=> array('lang' => 'ACL_M_CHGPOSTER', 'cat' => 'post_actions'),
 
-		'acl_m_move'	=> array('lang' => 'Can move topics', 'cat' => 'topic_actions'),
-		'acl_m_lock'	=> array('lang' => 'Can lock topics', 'cat' => 'topic_actions'),
-		'acl_m_split'	=> array('lang' => 'Can split topics', 'cat' => 'topic_actions'),
-		'acl_m_merge'	=> array('lang' => 'Can merge topics', 'cat' => 'topic_actions'),
+		'acl_m_move'	=> array('lang' => 'ACL_M_MOVE', 'cat' => 'topic_actions'),
+		'acl_m_lock'	=> array('lang' => 'ACL_M_LOCK', 'cat' => 'topic_actions'),
+		'acl_m_split'	=> array('lang' => 'ACL_M_SPLIT', 'cat' => 'topic_actions'),
+		'acl_m_merge'	=> array('lang' => 'ACL_M_MERGE', 'cat' => 'topic_actions'),
 
-		'acl_m_info'	=> array('lang' => 'Can view post details', 'cat' => 'misc'),
-		'acl_m_warn'	=> array('lang' => 'Can issue warnings<br /><em>This setting is only assigned globally. It is not forum based.</em>', 'cat' => 'misc'), // This moderator setting is only global (and not local)
-		'acl_m_ban'		=> array('lang' => 'Can manage bans<br /><em>This setting is only assigned globally. It is not forum based.</em>', 'cat' => 'misc'), // This moderator setting is only global (and not local)
+		'acl_m_info'	=> array('lang' => 'ACL_M_INFO', 'cat' => 'misc'),
+		'acl_m_warn'	=> array('lang' => 'ACL_M_WARN', 'cat' => 'misc'),
+		'acl_m_ban'		=> array('lang' => 'ACL_M_BAN', 'cat' => 'misc'),
 
 		// Admin Permissions
-		'acl_a_board'		=> array('lang' => 'Can alter board settings/check for updates', 'cat' => 'settings'),
-		'acl_a_server'		=> array('lang' => 'Can alter server/communication settings', 'cat' => 'settings'),
-		'acl_a_jabber'		=> array('lang' => 'Can alter Jabber settings', 'cat' => 'settings'),
-		'acl_a_phpinfo'		=> array('lang' => 'Can view php settings', 'cat' => 'settings'),
-
-		'acl_a_forum'		=> array('lang' => 'Can manage forums', 'cat' => 'forums'),
-		'acl_a_forumadd'	=> array('lang' => 'Can add new forums', 'cat' => 'forums'),
-		'acl_a_forumdel'	=> array('lang' => 'Can delete forums', 'cat' => 'forums'),
-		'acl_a_prune'		=> array('lang' => 'Can prune forums', 'cat' => 'forums'),
-
-		'acl_a_icons'		=> array('lang' => 'Can alter topic/post icons and smilies', 'cat' => 'posting'),
-		'acl_a_words'		=> array('lang' => 'Can alter word censors', 'cat' => 'posting'),
-		'acl_a_bbcode'		=> array('lang' => 'Can define BBCode tags', 'cat' => 'posting'),
-		'acl_a_attach'		=> array('lang' => 'Can alter attachment related settings', 'cat' => 'posting'),
-
-		'acl_a_user'		=> array('lang' => 'Can manage users<br /><em>This also includes seeing the users browser agent within the viewonline list.</em>', 'cat' => 'user_group'),
-		'acl_a_userdel'		=> array('lang' => 'Can delete/prune users', 'cat' => 'user_group'),
-		'acl_a_group'		=> array('lang' => 'Can manage groups', 'cat' => 'user_group'),
-		'acl_a_groupadd'	=> array('lang' => 'Can add new groups', 'cat' => 'user_group'),
-		'acl_a_groupdel'	=> array('lang' => 'Can delete groups', 'cat' => 'user_group'),
-		'acl_a_ranks'		=> array('lang' => 'Can manage ranks', 'cat' => 'user_group'),
-		'acl_a_profile'		=> array('lang' => 'Can manage custom profile fields', 'cat' => 'user_group'),
-		'acl_a_names'		=> array('lang' => 'Can manage disallowed names', 'cat' => 'user_group'),
-		'acl_a_ban'			=> array('lang' => 'Can manage bans', 'cat' => 'user_group'),
-
-		'acl_a_viewauth'	=> array('lang' => 'Can view permission masks', 'cat' => 'permissions'),
-		'acl_a_authgroups'	=> array('lang' => 'Can alter permissions for individual groups', 'cat' => 'permissions'),
-		'acl_a_authusers'	=> array('lang' => 'Can alter permissions for individual users', 'cat' => 'permissions'),
-		'acl_a_fauth'		=> array('lang' => 'Can alter forum permission class', 'cat' => 'permissions'),
-		'acl_a_mauth'		=> array('lang' => 'Can alter moderator permission class', 'cat' => 'permissions'),
-		'acl_a_aauth'		=> array('lang' => 'Can alter admin permission class', 'cat' => 'permissions'),
-		'acl_a_uauth'		=> array('lang' => 'Can alter user permission class', 'cat' => 'permissions'),
-		'acl_a_roles'		=> array('lang' => 'Can manage roles', 'cat' => 'permissions'),
-		'acl_a_switchperm'	=> array('lang' => 'Can use others permissions', 'cat' => 'permissions'),
-
-		'acl_a_styles'		=> array('lang' => 'Can manage styles', 'cat' => 'misc'),
-		'acl_a_extensions'	=> array('lang' => 'Can manage extensions', 'cat' => 'misc'),
-		'acl_a_viewlogs'	=> array('lang' => 'Can view logs', 'cat' => 'misc'),
-		'acl_a_clearlogs'	=> array('lang' => 'Can clear logs', 'cat' => 'misc'),
-		'acl_a_modules'		=> array('lang' => 'Can manage modules', 'cat' => 'misc'),
-		'acl_a_language'	=> array('lang' => 'Can manage language packs', 'cat' => 'misc'),
-		'acl_a_email'		=> array('lang' => 'Can send mass email', 'cat' => 'misc'),
-		'acl_a_bots'		=> array('lang' => 'Can manage bots', 'cat' => 'misc'),
-		'acl_a_reasons'		=> array('lang' => 'Can manage report/denial reasons', 'cat' => 'misc'),
-		'acl_a_backup'		=> array('lang' => 'Can backup/restore database', 'cat' => 'misc'),
-		'acl_a_search'		=> array('lang' => 'Can manage search backends and settings', 'cat' => 'misc'),
+		'acl_a_board'		=> array('lang' => 'ACL_A_BOARD', 'cat' => 'settings'),
+		'acl_a_server'		=> array('lang' => 'ACL_A_SERVER', 'cat' => 'settings'),
+		'acl_a_jabber'		=> array('lang' => 'ACL_A_JABBER', 'cat' => 'settings'),
+		'acl_a_phpinfo'		=> array('lang' => 'ACL_A_PHPINFO', 'cat' => 'settings'),
+
+		'acl_a_forum'		=> array('lang' => 'ACL_A_FORUM', 'cat' => 'forums'),
+		'acl_a_forumadd'	=> array('lang' => 'ACL_A_FORUMADD', 'cat' => 'forums'),
+		'acl_a_forumdel'	=> array('lang' => 'ACL_A_FORUMDEL', 'cat' => 'forums'),
+		'acl_a_prune'		=> array('lang' => 'ACL_A_PRUNE', 'cat' => 'forums'),
+
+		'acl_a_icons'		=> array('lang' => 'ACL_A_ICONS', 'cat' => 'posting'),
+		'acl_a_words'		=> array('lang' => 'ACL_A_WORDS', 'cat' => 'posting'),
+		'acl_a_bbcode'		=> array('lang' => 'ACL_A_BBCODE', 'cat' => 'posting'),
+		'acl_a_attach'		=> array('lang' => 'ACL_A_ATTACH', 'cat' => 'posting'),
+
+		'acl_a_user'		=> array('lang' => 'ACL_A_USER', 'cat' => 'user_group'),
+		'acl_a_userdel'		=> array('lang' => 'ACL_A_USERDEL', 'cat' => 'user_group'),
+		'acl_a_group'		=> array('lang' => 'ACL_A_GROUP', 'cat' => 'user_group'),
+		'acl_a_groupadd'	=> array('lang' => 'ACL_A_GROUPADD', 'cat' => 'user_group'),
+		'acl_a_groupdel'	=> array('lang' => 'ACL_A_GROUPDEL', 'cat' => 'user_group'),
+		'acl_a_ranks'		=> array('lang' => 'ACL_A_RANKS', 'cat' => 'user_group'),
+		'acl_a_profile'		=> array('lang' => 'ACL_A_PROFILE', 'cat' => 'user_group'),
+		'acl_a_names'		=> array('lang' => 'ACL_A_NAMES', 'cat' => 'user_group'),
+		'acl_a_ban'			=> array('lang' => 'ACL_A_BAN', 'cat' => 'user_group'),
+
+		'acl_a_viewauth'	=> array('lang' => 'ACL_A_VIEWAUTH', 'cat' => 'permissions'),
+		'acl_a_authgroups'	=> array('lang' => 'ACL_A_AUTHGROUPS', 'cat' => 'permissions'),
+		'acl_a_authusers'	=> array('lang' => 'ACL_A_AUTHUSERS', 'cat' => 'permissions'),
+		'acl_a_fauth'		=> array('lang' => 'ACL_A_FAUTH', 'cat' => 'permissions'),
+		'acl_a_mauth'		=> array('lang' => 'ACL_A_MAUTH', 'cat' => 'permissions'),
+		'acl_a_aauth'		=> array('lang' => 'ACL_A_AAUTH', 'cat' => 'permissions'),
+		'acl_a_uauth'		=> array('lang' => 'ACL_A_UAUTH', 'cat' => 'permissions'),
+		'acl_a_roles'		=> array('lang' => 'ACL_A_ROLES', 'cat' => 'permissions'),
+		'acl_a_switchperm'	=> array('lang' => 'ACL_A_SWITCHPERM', 'cat' => 'permissions'),
+
+		'acl_a_styles'		=> array('lang' => 'ACL_A_STYLES', 'cat' => 'misc'),
+		'acl_a_extensions'	=> array('lang' => 'ACL_A_EXTENSIONS', 'cat' => 'misc'),
+		'acl_a_viewlogs'	=> array('lang' => 'ACL_A_VIEWLOGS', 'cat' => 'misc'),
+		'acl_a_clearlogs'	=> array('lang' => 'ACL_A_CLEARLOGS', 'cat' => 'misc'),
+		'acl_a_modules'		=> array('lang' => 'ACL_A_MODULES', 'cat' => 'misc'),
+		'acl_a_language'	=> array('lang' => 'ACL_A_LANGUAGE', 'cat' => 'misc'),
+		'acl_a_email'		=> array('lang' => 'ACL_A_EMAIL', 'cat' => 'misc'),
+		'acl_a_bots'		=> array('lang' => 'ACL_A_BOTS', 'cat' => 'misc'),
+		'acl_a_reasons'		=> array('lang' => 'ACL_A_REASONS', 'cat' => 'misc'),
+		'acl_a_backup'		=> array('lang' => 'ACL_A_BACKUP', 'cat' => 'misc'),
+		'acl_a_search'		=> array('lang' => 'ACL_A_SEARCH', 'cat' => 'misc'),
 	);
 }
diff --git a/phpBB/language/en/acp/permissions_phpbb.php b/phpBB/language/en/acp/permissions_phpbb.php
index 4f2c9067d2..edcc812830 100644
--- a/phpBB/language/en/acp/permissions_phpbb.php
+++ b/phpBB/language/en/acp/permissions_phpbb.php
@@ -56,8 +56,8 @@ if (empty($lang) || !is_array($lang))
 *
 *	// Adding the permissions
 *	$lang = array_merge($lang, array(
-*		'acl_bug_view'		=> array('lang' => 'Can view bug reports', 'cat' => 'bugs'),
-*		'acl_bug_post'		=> array('lang' => 'Can post bugs', 'cat' => 'post'), // Using a phpBB category here
+*		'acl_bug_view'		=> 'Can view bug reports', 'cat' => 'bugs'),
+*		'acl_bug_post'		=> 'Can post bugs', // Using a phpBB category here
 *	));
 *
 *	</code>
@@ -82,146 +82,135 @@ $lang = array_merge($lang, array(
 
 // User Permissions
 $lang = array_merge($lang, array(
-	'acl_u_viewprofile'	=> array('lang' => 'Can view profiles, memberlist and online list', 'cat' => 'profile'),
-	'acl_u_chgname'		=> array('lang' => 'Can change username', 'cat' => 'profile'),
-	'acl_u_chgpasswd'	=> array('lang' => 'Can change password', 'cat' => 'profile'),
-	'acl_u_chgemail'	=> array('lang' => 'Can change email address', 'cat' => 'profile'),
-	'acl_u_chgavatar'	=> array('lang' => 'Can change avatar', 'cat' => 'profile'),
-	'acl_u_chggrp'		=> array('lang' => 'Can change default usergroup', 'cat' => 'profile'),
-	'acl_u_chgprofileinfo'	=> array('lang' => 'Can change profile field information', 'cat' => 'profile'),
-
-	'acl_u_attach'		=> array('lang' => 'Can attach files', 'cat' => 'post'),
-	'acl_u_download'	=> array('lang' => 'Can download files', 'cat' => 'post'),
-	'acl_u_savedrafts'	=> array('lang' => 'Can save drafts', 'cat' => 'post'),
-	'acl_u_chgcensors'	=> array('lang' => 'Can disable word censors', 'cat' => 'post'),
-	'acl_u_sig'			=> array('lang' => 'Can use signature', 'cat' => 'post'),
-
-	'acl_u_sendpm'		=> array('lang' => 'Can send private messages', 'cat' => 'pm'),
-	'acl_u_masspm'		=> array('lang' => 'Can send messages to multiple users', 'cat' => 'pm'),
-	'acl_u_masspm_group'=> array('lang' => 'Can send messages to groups', 'cat' => 'pm'),
-	'acl_u_readpm'		=> array('lang' => 'Can read private messages', 'cat' => 'pm'),
-	'acl_u_pm_edit'		=> array('lang' => 'Can edit own private messages', 'cat' => 'pm'),
-	'acl_u_pm_delete'	=> array('lang' => 'Can remove private messages from own folder', 'cat' => 'pm'),
-	'acl_u_pm_forward'	=> array('lang' => 'Can forward private messages', 'cat' => 'pm'),
-	'acl_u_pm_emailpm'	=> array('lang' => 'Can email private messages', 'cat' => 'pm'),
-	'acl_u_pm_printpm'	=> array('lang' => 'Can print private messages', 'cat' => 'pm'),
-	'acl_u_pm_attach'	=> array('lang' => 'Can attach files in private messages', 'cat' => 'pm'),
-	'acl_u_pm_download'	=> array('lang' => 'Can download files in private messages', 'cat' => 'pm'),
-	'acl_u_pm_bbcode'	=> array('lang' => 'Can use BBCode in private messages', 'cat' => 'pm'),
-	'acl_u_pm_smilies'	=> array('lang' => 'Can use smilies in private messages', 'cat' => 'pm'),
-	'acl_u_pm_img'		=> array('lang' => 'Can use [img] BBCode tag in private messages', 'cat' => 'pm'),
-	'acl_u_pm_flash'	=> array('lang' => 'Can use [flash] BBCode tag in private messages', 'cat' => 'pm'),
-
-	'acl_u_sendemail'	=> array('lang' => 'Can send emails', 'cat' => 'misc'),
-	'acl_u_sendim'		=> array('lang' => 'Can send instant messages', 'cat' => 'misc'),
-	'acl_u_ignoreflood'	=> array('lang' => 'Can ignore flood limit', 'cat' => 'misc'),
-	'acl_u_hideonline'	=> array('lang' => 'Can hide online status', 'cat' => 'misc'),
-	'acl_u_viewonline'	=> array('lang' => 'Can view hidden online users', 'cat' => 'misc'),
-	'acl_u_search'		=> array('lang' => 'Can search board', 'cat' => 'misc'),
+	'ACL_U_VIEWPROFILE'	=> 'Can view profiles, memberlist and online list',
+	'ACL_U_CHGNAME'		=> 'Can change username',
+	'ACL_U_CHGPASSWD'	=> 'Can change password',
+	'ACL_U_CHGEMAIL'	=> 'Can change email address',
+	'ACL_U_CHGAVATAR'	=> 'Can change avatar',
+	'ACL_U_CHGGRP'		=> 'Can change default usergroup',
+	'ACL_U_CHGPROFILEINFO'	=> 'Can change profile field information',
+
+	'ACL_U_ATTACH'		=> 'Can attach files',
+	'ACL_U_DOWNLOAD'	=> 'Can download files',
+	'ACL_U_SAVEDRAFTS'	=> 'Can save drafts',
+	'ACL_U_CHGCENSORS'	=> 'Can disable word censors',
+	'ACL_U_SIG'			=> 'Can use signature',
+
+	'ACL_U_SENDPM'		=> 'Can send private messages',
+	'ACL_U_MASSPM'		=> 'Can send messages to multiple users',
+	'ACL_U_MASSPM_GROUP'=> 'Can send messages to groups',
+	'ACL_U_READPM'		=> 'Can read private messages',
+	'ACL_U_PM_EDIT'		=> 'Can edit own private messages',
+	'ACL_U_PM_DELETE'	=> 'Can remove private messages from own folder',
+	'ACL_U_PM_FORWARD'	=> 'Can forward private messages',
+	'ACL_U_PM_EMAILPM'	=> 'Can email private messages',
+	'ACL_U_PM_PRINTPM'	=> 'Can print private messages',
+	'ACL_U_PM_ATTACH'	=> 'Can attach files in private messages',
+	'ACL_U_PM_DOWNLOAD'	=> 'Can download files in private messages',
+	'ACL_U_PM_BBCODE'	=> 'Can use BBCode in private messages',
+	'ACL_U_PM_SMILIES'	=> 'Can use smilies in private messages',
+	'ACL_U_PM_IMG'		=> 'Can use [img] BBCode tag in private messages',
+	'ACL_U_PM_FLASH'	=> 'Can use [flash] BBCode tag in private messages',
+
+	'ACL_U_SENDEMAIL'	=> 'Can send emails',
+	'ACL_U_SENDIM'		=> 'Can send instant messages',
+	'ACL_U_IGNOREFLOOD'	=> 'Can ignore flood limit',
+	'ACL_U_HIDEONLINE'	=> 'Can hide online status',
+	'ACL_U_VIEWONLINE'	=> 'Can view hidden online users',
+	'ACL_U_SEARCH'		=> 'Can search board',
 ));
 
 // Forum Permissions
 $lang = array_merge($lang, array(
-	'acl_f_list'		=> array('lang' => 'Can see forum', 'cat' => 'actions'),
-	'acl_f_read'		=> array('lang' => 'Can read forum', 'cat' => 'actions'),	
-	'acl_f_search'		=> array('lang' => 'Can search the forum', 'cat' => 'actions'),
-	'acl_f_subscribe'	=> array('lang' => 'Can subscribe forum', 'cat' => 'actions'),
-	'acl_f_print'		=> array('lang' => 'Can print topics', 'cat' => 'actions'),	
-	'acl_f_email'		=> array('lang' => 'Can email topics', 'cat' => 'actions'),	
-	'acl_f_bump'		=> array('lang' => 'Can bump topics', 'cat' => 'actions'),
-	'acl_f_user_lock'	=> array('lang' => 'Can lock own topics', 'cat' => 'actions'),
-	'acl_f_download'	=> array('lang' => 'Can download files', 'cat' => 'actions'),	
-	'acl_f_report'		=> array('lang' => 'Can report posts', 'cat' => 'actions'),
-
-	'acl_f_post'		=> array('lang' => 'Can start new topics', 'cat' => 'post'),
-	'acl_f_sticky'		=> array('lang' => 'Can post stickies', 'cat' => 'post'),
-	'acl_f_announce'	=> array('lang' => 'Can post announcements', 'cat' => 'post'),
-	'acl_f_reply'		=> array('lang' => 'Can reply to topics', 'cat' => 'post'),
-	'acl_f_edit'		=> array('lang' => 'Can edit own posts', 'cat' => 'post'),
-	'acl_f_delete'		=> array('lang' => 'Can permanently delete own posts', 'cat' => 'post'),
-	'acl_f_softdelete'  => array('lang' => 'Can soft delete own posts<br /><em>Moderators, who have the approve posts permission, can restore soft deleted posts.</em>', 'cat' => 'post'),
-	'acl_f_ignoreflood' => array('lang' => 'Can ignore flood limit', 'cat' => 'post'),
-	'acl_f_postcount'	=> array('lang' => 'Increment post counter<br /><em>Please note that this setting only affects new posts.</em>', 'cat' => 'post'),
-	'acl_f_noapprove'	=> array('lang' => 'Can post without approval', 'cat' => 'post'),	
-
-	'acl_f_attach'		=> array('lang' => 'Can attach files', 'cat' => 'content'),	
-	'acl_f_icons'		=> array('lang' => 'Can use topic/post icons', 'cat' => 'content'),
-	'acl_f_bbcode'		=> array('lang' => 'Can use BBCode', 'cat' => 'content'),	
-	'acl_f_flash'		=> array('lang' => 'Can use [flash] BBCode tag', 'cat' => 'content'),
-	'acl_f_img'			=> array('lang' => 'Can use [img] BBCode tag', 'cat' => 'content'),
-	'acl_f_sigs'		=> array('lang' => 'Can use signatures', 'cat' => 'content'),
-	'acl_f_smilies'		=> array('lang' => 'Can use smilies', 'cat' => 'content'),
-
-	'acl_f_poll'		=> array('lang' => 'Can create polls', 'cat' => 'polls'),
-	'acl_f_vote'		=> array('lang' => 'Can vote in polls', 'cat' => 'polls'),
-	'acl_f_votechg'		=> array('lang' => 'Can change existing vote', 'cat' => 'polls'),
+	'ACL_F_POST'		=> 'Can start new topics',
+	'ACL_F_STICKY'		=> 'Can post stickies',
+	'ACL_F_ANNOUNCE'	=> 'Can post announcements',
+	'ACL_F_REPLY'		=> 'Can reply to topics',
+	'ACL_F_EDIT'		=> 'Can edit own posts',
+	'ACL_F_DELETE'		=> 'Can permanently delete own posts',
+	'ACL_F_SOFTDELETE'	=> 'Can soft delete own posts<br /><em>Moderators, who have the approve posts permission, can restore soft deleted posts.</em>',
+	'ACL_F_IGNOREFLOOD' => 'Can ignore flood limit',
+	'ACL_F_POSTCOUNT'	=> 'Increment post counter<br /><em>Please note that this setting only affects new posts.</em>',
+	'ACL_F_NOAPPROVE'	=> 'Can post without approval',
+
+	'ACL_F_ATTACH'		=> 'Can attach files',
+	'ACL_F_ICONS'		=> 'Can use topic/post icons',
+	'ACL_F_BBCODE'		=> 'Can use BBCode',
+	'ACL_F_FLASH'		=> 'Can use [flash] BBCode tag',
+	'ACL_F_IMG'			=> 'Can use [img] BBCode tag',
+	'ACL_F_SIGS'		=> 'Can use signatures',
+	'ACL_F_SMILIES'		=> 'Can use smilies',
+
+	'ACL_F_POLL'		=> 'Can create polls',
+	'ACL_F_VOTE'		=> 'Can vote in polls',
+	'ACL_F_VOTECHG'		=> 'Can change existing vote',
 ));
 
 // Moderator Permissions
 $lang = array_merge($lang, array(
-	'acl_m_edit'		=> array('lang' => 'Can edit posts', 'cat' => 'post_actions'),
-	'acl_m_delete'		=> array('lang' => 'Can permanently delete posts', 'cat' => 'post_actions'),
-	'acl_m_softdelete'	=> array('lang' => 'Can soft delete posts<br /><em>Moderators, who have the approve posts permission, can restore soft deleted posts.</em>', 'cat' => 'post_actions'),
-	'acl_m_approve'		=> array('lang' => 'Can approve and restore posts', 'cat' => 'post_actions'),
-	'acl_m_report'		=> array('lang' => 'Can close and delete reports', 'cat' => 'post_actions'),
-	'acl_m_chgposter'	=> array('lang' => 'Can change post author', 'cat' => 'post_actions'),
-
-	'acl_m_move'	=> array('lang' => 'Can move topics', 'cat' => 'topic_actions'),
-	'acl_m_lock'	=> array('lang' => 'Can lock topics', 'cat' => 'topic_actions'),
-	'acl_m_split'	=> array('lang' => 'Can split topics', 'cat' => 'topic_actions'),
-	'acl_m_merge'	=> array('lang' => 'Can merge topics', 'cat' => 'topic_actions'),
-
-	'acl_m_info'	=> array('lang' => 'Can view post details', 'cat' => 'misc'),
-	'acl_m_warn'	=> array('lang' => 'Can issue warnings<br /><em>This setting is only assigned globally. It is not forum based.</em>', 'cat' => 'misc'), // This moderator setting is only global (and not local)
-	'acl_m_ban'		=> array('lang' => 'Can manage bans<br /><em>This setting is only assigned globally. It is not forum based.</em>', 'cat' => 'misc'), // This moderator setting is only global (and not local)
+	'ACL_M_EDIT'		=> 'Can edit posts',
+	'ACL_M_DELETE'		=> 'Can permanently delete posts',
+	'ACL_M_SOFTDELETE'	=> 'Can soft delete posts<br /><em>Moderators, who have the approve posts permission, can restore soft deleted posts.</em>',
+	'ACL_M_APPROVE'		=> 'Can approve posts',
+	'ACL_M_REPORT'		=> 'Can close and delete reports',
+	'ACL_M_CHGPOSTER'	=> 'Can change post author',
+
+	'ACL_M_MOVE'	=> 'Can move topics',
+	'ACL_M_LOCK'	=> 'Can lock topics',
+	'ACL_M_SPLIT'	=> 'Can split topics',
+	'ACL_M_MERGE'	=> 'Can merge topics',
+
+	'ACL_M_INFO'	=> 'Can view post details',
+	'ACL_M_WARN'	=> 'Can issue warnings<br /><em>This setting is only assigned globally. It is not forum based.</em>', // This moderator setting is only global (and not local)
+	'ACL_M_BAN'		=> 'Can manage bans<br /><em>This setting is only assigned globally. It is not forum based.</em>', // This moderator setting is only global (and not local)
 ));
 
 // Admin Permissions
 $lang = array_merge($lang, array(
-	'acl_a_board'		=> array('lang' => 'Can alter board settings/check for updates', 'cat' => 'settings'),
-	'acl_a_server'		=> array('lang' => 'Can alter server/communication settings', 'cat' => 'settings'),
-	'acl_a_jabber'		=> array('lang' => 'Can alter Jabber settings', 'cat' => 'settings'),
-	'acl_a_phpinfo'		=> array('lang' => 'Can view php settings', 'cat' => 'settings'),
-
-	'acl_a_forum'		=> array('lang' => 'Can manage forums', 'cat' => 'forums'),
-	'acl_a_forumadd'	=> array('lang' => 'Can add new forums', 'cat' => 'forums'),
-	'acl_a_forumdel'	=> array('lang' => 'Can delete forums', 'cat' => 'forums'),
-	'acl_a_prune'		=> array('lang' => 'Can prune forums', 'cat' => 'forums'),
-
-	'acl_a_icons'		=> array('lang' => 'Can alter topic/post icons and smilies', 'cat' => 'posting'),
-	'acl_a_words'		=> array('lang' => 'Can alter word censors', 'cat' => 'posting'),
-	'acl_a_bbcode'		=> array('lang' => 'Can define BBCode tags', 'cat' => 'posting'),
-	'acl_a_attach'		=> array('lang' => 'Can alter attachment related settings', 'cat' => 'posting'),
-
-	'acl_a_user'		=> array('lang' => 'Can manage users<br /><em>This also includes seeing the users browser agent within the viewonline list.</em>', 'cat' => 'user_group'),
-	'acl_a_userdel'		=> array('lang' => 'Can delete/prune users', 'cat' => 'user_group'),
-	'acl_a_group'		=> array('lang' => 'Can manage groups', 'cat' => 'user_group'),
-	'acl_a_groupadd'	=> array('lang' => 'Can add new groups', 'cat' => 'user_group'),
-	'acl_a_groupdel'	=> array('lang' => 'Can delete groups', 'cat' => 'user_group'),
-	'acl_a_ranks'		=> array('lang' => 'Can manage ranks', 'cat' => 'user_group'),
-	'acl_a_profile'		=> array('lang' => 'Can manage custom profile fields', 'cat' => 'user_group'),
-	'acl_a_names'		=> array('lang' => 'Can manage disallowed names', 'cat' => 'user_group'),
-	'acl_a_ban'			=> array('lang' => 'Can manage bans', 'cat' => 'user_group'),
-
-	'acl_a_viewauth'	=> array('lang' => 'Can view permission masks', 'cat' => 'permissions'),
-	'acl_a_authgroups'	=> array('lang' => 'Can alter permissions for individual groups', 'cat' => 'permissions'),
-	'acl_a_authusers'	=> array('lang' => 'Can alter permissions for individual users', 'cat' => 'permissions'),
-	'acl_a_fauth'		=> array('lang' => 'Can alter forum permission class', 'cat' => 'permissions'),
-	'acl_a_mauth'		=> array('lang' => 'Can alter moderator permission class', 'cat' => 'permissions'),
-	'acl_a_aauth'		=> array('lang' => 'Can alter admin permission class', 'cat' => 'permissions'),
-	'acl_a_uauth'		=> array('lang' => 'Can alter user permission class', 'cat' => 'permissions'),
-	'acl_a_roles'		=> array('lang' => 'Can manage roles', 'cat' => 'permissions'),
-	'acl_a_switchperm'	=> array('lang' => 'Can use others permissions', 'cat' => 'permissions'),
-
-	'acl_a_styles'		=> array('lang' => 'Can manage styles', 'cat' => 'misc'),
-	'acl_a_extensions'	=> array('lang' => 'Can manage extensions', 'cat' => 'misc'),
-	'acl_a_viewlogs'	=> array('lang' => 'Can view logs', 'cat' => 'misc'),
-	'acl_a_clearlogs'	=> array('lang' => 'Can clear logs', 'cat' => 'misc'),
-	'acl_a_modules'		=> array('lang' => 'Can manage modules', 'cat' => 'misc'),
-	'acl_a_language'	=> array('lang' => 'Can manage language packs', 'cat' => 'misc'),
-	'acl_a_email'		=> array('lang' => 'Can send mass email', 'cat' => 'misc'),
-	'acl_a_bots'		=> array('lang' => 'Can manage bots', 'cat' => 'misc'),
-	'acl_a_reasons'		=> array('lang' => 'Can manage report/denial reasons', 'cat' => 'misc'),
-	'acl_a_backup'		=> array('lang' => 'Can backup/restore database', 'cat' => 'misc'),
-	'acl_a_search'		=> array('lang' => 'Can manage search backends and settings', 'cat' => 'misc'),
+	'ACL_A_BOARD'		=> 'Can alter board settings/check for updates',
+	'ACL_A_SERVER'		=> 'Can alter server/communication settings',
+	'ACL_A_JABBER'		=> 'Can alter Jabber settings',
+	'ACL_A_PHPINFO'		=> 'Can view php settings',
+
+	'ACL_A_FORUM'		=> 'Can manage forums',
+	'ACL_A_FORUMADD'	=> 'Can add new forums',
+	'ACL_A_FORUMDEL'	=> 'Can delete forums',
+	'ACL_A_PRUNE'		=> 'Can prune forums',
+
+	'ACL_A_ICONS'		=> 'Can alter topic/post icons and smilies',
+	'ACL_A_WORDS'		=> 'Can alter word censors',
+	'ACL_A_BBCODE'		=> 'Can define BBCode tags',
+	'ACL_A_ATTACH'		=> 'Can alter attachment related settings',
+
+	'ACL_A_USER'		=> 'Can manage users<br /><em>This also includes seeing the users browser agent within the viewonline list.</em>',
+	'ACL_A_USERDEL'		=> 'Can delete/prune users',
+	'ACL_A_GROUP'		=> 'Can manage groups',
+	'ACL_A_GROUPADD'	=> 'Can add new groups',
+	'ACL_A_GROUPDEL'	=> 'Can delete groups',
+	'ACL_A_RANKS'		=> 'Can manage ranks',
+	'ACL_A_PROFILE'		=> 'Can manage custom profile fields',
+	'ACL_A_NAMES'		=> 'Can manage disallowed names',
+	'ACL_A_BAN'			=> 'Can manage bans',
+
+	'ACL_A_VIEWAUTH'	=> 'Can view permission masks',
+	'ACL_A_AUTHGROUPS'	=> 'Can alter permissions for individual groups',
+	'ACL_A_AUTHUSERS'	=> 'Can alter permissions for individual users',
+	'ACL_A_FAUTH'		=> 'Can alter forum permission class',
+	'ACL_A_MAUTH'		=> 'Can alter moderator permission class',
+	'ACL_A_AAUTH'		=> 'Can alter admin permission class',
+	'ACL_A_UAUTH'		=> 'Can alter user permission class',
+	'ACL_A_ROLES'		=> 'Can manage roles',
+	'ACL_A_SWITCHPERM'	=> 'Can use others permissions',
+
+	'ACL_A_STYLES'		=> 'Can manage styles',
+	'ACL_A_EXTENSIONS'	=> 'Can manage extensions',
+	'ACL_A_VIEWLOGS'	=> 'Can view logs',
+	'ACL_A_CLEARLOGS'	=> 'Can clear logs',
+	'ACL_A_MODULES'		=> 'Can manage modules',
+	'ACL_A_LANGUAGE'	=> 'Can manage language packs',
+	'ACL_A_EMAIL'		=> 'Can send mass email',
+	'ACL_A_BOTS'		=> 'Can manage bots',
+	'ACL_A_REASONS'		=> 'Can manage report/denial reasons',
+	'ACL_A_BACKUP'		=> 'Can backup/restore database',
+	'ACL_A_SEARCH'		=> 'Can manage search backends and settings',
 ));
-- 
cgit v1.2.1


From 4a64e2c2b3d4b39cdedec72551076595a9cd6a6e Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sat, 6 Jul 2013 16:07:05 +0200
Subject: [ticket/11582] Fix documentation for adding permissions

PHPBB3-11582
---
 phpBB/language/en/acp/permissions_phpbb.php | 34 ++++++-----------------------
 1 file changed, 7 insertions(+), 27 deletions(-)

diff --git a/phpBB/language/en/acp/permissions_phpbb.php b/phpBB/language/en/acp/permissions_phpbb.php
index edcc812830..d0128db34a 100644
--- a/phpBB/language/en/acp/permissions_phpbb.php
+++ b/phpBB/language/en/acp/permissions_phpbb.php
@@ -33,34 +33,14 @@ if (empty($lang) || !is_array($lang))
 // in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
 
 /**
-*	MODDERS PLEASE NOTE
+*	EXTENSION-DEVELOPERS PLEASE NOTE
 *
-*	You are able to put your permission sets into a separate file too by
-*	prefixing the new file with permissions_ and putting it into the acp
-*	language folder.
-*
-*	An example of how the file could look like:
-*
-*	<code>
-*
-*	if (empty($lang) || !is_array($lang))
-*	{
-*		$lang = array();
-*	}
-*
-*	// Adding new category
-*	$lang['permission_cat']['bugs'] = 'Bugs';
-*
-*	// Adding new permission set
-*	$lang['permission_type']['bug_'] = 'Bug Permissions';
-*
-*	// Adding the permissions
-*	$lang = array_merge($lang, array(
-*		'acl_bug_view'		=> 'Can view bug reports', 'cat' => 'bugs'),
-*		'acl_bug_post'		=> 'Can post bugs', // Using a phpBB category here
-*	));
-*
-*	</code>
+*	You are able to put your permission sets into your extension.
+*	The permissions logic should be added via the 'core.permissions' event.
+*	You can easily add new permission categories, types and permissions, by
+*	simply merging them into the respective arrays.
+*	The respective language strings should be added into a language file, that
+*	start with 'permissions_', so they are automatically loaded within the ACP.
 */
 
 $lang = array_merge($lang, array(
-- 
cgit v1.2.1


From aaa44eda2b1df7d7c5c02651c1a9536343eca846 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 8 Jul 2013 00:48:26 +0200
Subject: [ticket/11582] Remove useless prefix

PHPBB3-11582
---
 phpBB/includes/permissions.php | 266 ++++++++++++++++++++---------------------
 1 file changed, 133 insertions(+), 133 deletions(-)

diff --git a/phpBB/includes/permissions.php b/phpBB/includes/permissions.php
index 4cb3356c53..1db6843dbb 100644
--- a/phpBB/includes/permissions.php
+++ b/phpBB/includes/permissions.php
@@ -52,14 +52,14 @@ class phpbb_permissions
 		* @var	array	types			Array with permission types (a_, u_, m_, etc.)
 		* @var	array	categories		Array with permission categories (pm, post, settings, misc, etc.)
 		* @var	array	permissions		Array with permissions. Each Permission has the following layout:
-		*		'acl_<type><permission>' => array(
+		*		'<type><permission>' => array(
 		*			'lang'	=> 'Language Key with a Short description', // Optional, if not set,
-		*						// the permissions identifier 'acl_<type><permission>' is used with
+		*						// the permissions identifier '<type><permission>' is used with
 		*						// all uppercase.
 		*			'cat'	=> 'Identifier of the category, the permission should be displayed in',
 		*		),
 		*		Example:
-		*		'acl_u_viewprofile' => array(
+		*		'u_viewprofile' => array(
 		*			'lang'	=> 'ACL_U_VIEWPROFILE',
 		*			'cat'	=> 'profile',
 		*		),
@@ -129,14 +129,14 @@ class phpbb_permissions
 	/**
 	* Returns an array with all the permissions.
 	* Each Permission has the following layout:
-	*	'acl_<type><permission>' => array(
+	*	'<type><permission>' => array(
 	*		'lang'	=> 'Language Key with a Short description', // Optional, if not set,
-	*					// the permissions identifier 'acl_<type><permission>' is used with
+	*					// the permissions identifier '<type><permission>' is used with
 	*					// all uppercase.
 	*		'cat'	=> 'Identifier of the category, the permission should be displayed in',
 	*	),
 	*	Example:
-	*	'acl_u_viewprofile' => array(
+	*	'u_viewprofile' => array(
 	*		'lang'	=> 'ACL_U_VIEWPROFILE',
 	*		'cat'	=> 'profile',
 	*	),
@@ -165,7 +165,7 @@ class phpbb_permissions
 	*/
 	public function get_permission_lang($permission)
 	{
-		return (isset($this->permissions['acl_' . $permission]['lang'])) ? $this->user->lang($this->permissions['acl_' . $permission]['lang']) : $this->user->lang('ACL_' . strtoupper($permission));
+		return (isset($this->permissions[$permission]['lang'])) ? $this->user->lang($this->permissions[$permission]['lang']) : $this->user->lang('ACL_' . strtoupper($permission));
 	}
 
 	protected $types = array(
@@ -197,139 +197,139 @@ class phpbb_permissions
 
 	protected $permissions = array(
 		// User Permissions
-		'acl_u_viewprofile'	=> array('lang' => 'ACL_U_VIEWPROFILE', 'cat' => 'profile'),
-		'acl_u_chgname'		=> array('lang' => 'ACL_U_CHGNAME', 'cat' => 'profile'),
-		'acl_u_chgpasswd'	=> array('lang' => 'ACL_U_CHGPASSWD', 'cat' => 'profile'),
-		'acl_u_chgemail'	=> array('lang' => 'ACL_U_CHGEMAIL', 'cat' => 'profile'),
-		'acl_u_chgavatar'	=> array('lang' => 'ACL_U_CHGAVATAR', 'cat' => 'profile'),
-		'acl_u_chggrp'		=> array('lang' => 'ACL_U_CHGGRP', 'cat' => 'profile'),
-		'acl_u_chgprofileinfo'	=> array('lang' => 'ACL_U_CHGPROFILEINFO', 'cat' => 'profile'),
-
-		'acl_u_attach'		=> array('lang' => 'ACL_U_ATTACH', 'cat' => 'post'),
-		'acl_u_download'	=> array('lang' => 'ACL_U_DOWNLOAD', 'cat' => 'post'),
-		'acl_u_savedrafts'	=> array('lang' => 'ACL_U_SAVEDRAFTS', 'cat' => 'post'),
-		'acl_u_chgcensors'	=> array('lang' => 'ACL_U_CHGCENSORS', 'cat' => 'post'),
-		'acl_u_sig'			=> array('lang' => 'ACL_U_SIG', 'cat' => 'post'),
-
-		'acl_u_sendpm'		=> array('lang' => 'ACL_U_SENDPM', 'cat' => 'pm'),
-		'acl_u_masspm'		=> array('lang' => 'ACL_U_MASSPM', 'cat' => 'pm'),
-		'acl_u_masspm_group'=> array('lang' => 'ACL_U_MASSPM_GROUP', 'cat' => 'pm'),
-		'acl_u_readpm'		=> array('lang' => 'ACL_U_READPM', 'cat' => 'pm'),
-		'acl_u_pm_edit'		=> array('lang' => 'ACL_U_PM_EDIT', 'cat' => 'pm'),
-		'acl_u_pm_delete'	=> array('lang' => 'ACL_U_PM_DELETE', 'cat' => 'pm'),
-		'acl_u_pm_forward'	=> array('lang' => 'ACL_U_PM_FORWARD', 'cat' => 'pm'),
-		'acl_u_pm_emailpm'	=> array('lang' => 'ACL_U_PM_EMAILPM', 'cat' => 'pm'),
-		'acl_u_pm_printpm'	=> array('lang' => 'ACL_U_PM_PRINTPM', 'cat' => 'pm'),
-		'acl_u_pm_attach'	=> array('lang' => 'ACL_U_PM_ATTACH', 'cat' => 'pm'),
-		'acl_u_pm_download'	=> array('lang' => 'ACL_U_PM_DOWNLOAD', 'cat' => 'pm'),
-		'acl_u_pm_bbcode'	=> array('lang' => 'ACL_U_PM_BBCODE', 'cat' => 'pm'),
-		'acl_u_pm_smilies'	=> array('lang' => 'ACL_U_PM_SMILIES', 'cat' => 'pm'),
-		'acl_u_pm_img'		=> array('lang' => 'ACL_U_PM_IMG', 'cat' => 'pm'),
-		'acl_u_pm_flash'	=> array('lang' => 'ACL_U_PM_FLASH', 'cat' => 'pm'),
-
-		'acl_u_sendemail'	=> array('lang' => 'ACL_U_SENDEMAIL', 'cat' => 'misc'),
-		'acl_u_sendim'		=> array('lang' => 'ACL_U_SENDIM', 'cat' => 'misc'),
-		'acl_u_ignoreflood'	=> array('lang' => 'ACL_U_IGNOREFLOOD', 'cat' => 'misc'),
-		'acl_u_hideonline'	=> array('lang' => 'ACL_U_HIDEONLINE', 'cat' => 'misc'),
-		'acl_u_viewonline'	=> array('lang' => 'ACL_U_VIEWONLINE', 'cat' => 'misc'),
-		'acl_u_search'		=> array('lang' => 'ACL_U_SEARCH', 'cat' => 'misc'),
+		'u_viewprofile'	=> array('lang' => 'ACL_U_VIEWPROFILE', 'cat' => 'profile'),
+		'u_chgname'		=> array('lang' => 'ACL_U_CHGNAME', 'cat' => 'profile'),
+		'u_chgpasswd'	=> array('lang' => 'ACL_U_CHGPASSWD', 'cat' => 'profile'),
+		'u_chgemail'	=> array('lang' => 'ACL_U_CHGEMAIL', 'cat' => 'profile'),
+		'u_chgavatar'	=> array('lang' => 'ACL_U_CHGAVATAR', 'cat' => 'profile'),
+		'u_chggrp'		=> array('lang' => 'ACL_U_CHGGRP', 'cat' => 'profile'),
+		'u_chgprofileinfo'	=> array('lang' => 'ACL_U_CHGPROFILEINFO', 'cat' => 'profile'),
+
+		'u_attach'		=> array('lang' => 'ACL_U_ATTACH', 'cat' => 'post'),
+		'u_download'	=> array('lang' => 'ACL_U_DOWNLOAD', 'cat' => 'post'),
+		'u_savedrafts'	=> array('lang' => 'ACL_U_SAVEDRAFTS', 'cat' => 'post'),
+		'u_chgcensors'	=> array('lang' => 'ACL_U_CHGCENSORS', 'cat' => 'post'),
+		'u_sig'			=> array('lang' => 'ACL_U_SIG', 'cat' => 'post'),
+
+		'u_sendpm'		=> array('lang' => 'ACL_U_SENDPM', 'cat' => 'pm'),
+		'u_masspm'		=> array('lang' => 'ACL_U_MASSPM', 'cat' => 'pm'),
+		'u_masspm_group'=> array('lang' => 'ACL_U_MASSPM_GROUP', 'cat' => 'pm'),
+		'u_readpm'		=> array('lang' => 'ACL_U_READPM', 'cat' => 'pm'),
+		'u_pm_edit'		=> array('lang' => 'ACL_U_PM_EDIT', 'cat' => 'pm'),
+		'u_pm_delete'	=> array('lang' => 'ACL_U_PM_DELETE', 'cat' => 'pm'),
+		'u_pm_forward'	=> array('lang' => 'ACL_U_PM_FORWARD', 'cat' => 'pm'),
+		'u_pm_emailpm'	=> array('lang' => 'ACL_U_PM_EMAILPM', 'cat' => 'pm'),
+		'u_pm_printpm'	=> array('lang' => 'ACL_U_PM_PRINTPM', 'cat' => 'pm'),
+		'u_pm_attach'	=> array('lang' => 'ACL_U_PM_ATTACH', 'cat' => 'pm'),
+		'u_pm_download'	=> array('lang' => 'ACL_U_PM_DOWNLOAD', 'cat' => 'pm'),
+		'u_pm_bbcode'	=> array('lang' => 'ACL_U_PM_BBCODE', 'cat' => 'pm'),
+		'u_pm_smilies'	=> array('lang' => 'ACL_U_PM_SMILIES', 'cat' => 'pm'),
+		'u_pm_img'		=> array('lang' => 'ACL_U_PM_IMG', 'cat' => 'pm'),
+		'u_pm_flash'	=> array('lang' => 'ACL_U_PM_FLASH', 'cat' => 'pm'),
+
+		'u_sendemail'	=> array('lang' => 'ACL_U_SENDEMAIL', 'cat' => 'misc'),
+		'u_sendim'		=> array('lang' => 'ACL_U_SENDIM', 'cat' => 'misc'),
+		'u_ignoreflood'	=> array('lang' => 'ACL_U_IGNOREFLOOD', 'cat' => 'misc'),
+		'u_hideonline'	=> array('lang' => 'ACL_U_HIDEONLINE', 'cat' => 'misc'),
+		'u_viewonline'	=> array('lang' => 'ACL_U_VIEWONLINE', 'cat' => 'misc'),
+		'u_search'		=> array('lang' => 'ACL_U_SEARCH', 'cat' => 'misc'),
 
 		// Forum Permissions
-		'acl_f_list'		=> array('lang' => 'ACL_F_LIST', 'cat' => 'actions'),
-		'acl_f_read'		=> array('lang' => 'ACL_F_READ', 'cat' => 'actions'),	
-		'acl_f_search'		=> array('lang' => 'ACL_F_SEARCH', 'cat' => 'actions'),
-		'acl_f_subscribe'	=> array('lang' => 'ACL_F_SUBSCRIBE', 'cat' => 'actions'),
-		'acl_f_print'		=> array('lang' => 'ACL_F_PRINT', 'cat' => 'actions'),	
-		'acl_f_email'		=> array('lang' => 'ACL_F_EMAIL', 'cat' => 'actions'),	
-		'acl_f_bump'		=> array('lang' => 'ACL_F_BUMP', 'cat' => 'actions'),
-		'acl_f_user_lock'	=> array('lang' => 'ACL_F_USER_LOCK', 'cat' => 'actions'),
-		'acl_f_download'	=> array('lang' => 'ACL_F_DOWNLOAD', 'cat' => 'actions'),	
-		'acl_f_report'		=> array('lang' => 'ACL_F_REPORT', 'cat' => 'actions'),
-
-		'acl_f_post'		=> array('lang' => 'ACL_F_POST', 'cat' => 'post'),
-		'acl_f_sticky'		=> array('lang' => 'ACL_F_STICKY', 'cat' => 'post'),
-		'acl_f_announce'	=> array('lang' => 'ACL_F_ANNOUNCE', 'cat' => 'post'),
-		'acl_f_reply'		=> array('lang' => 'ACL_F_REPLY', 'cat' => 'post'),
-		'acl_f_edit'		=> array('lang' => 'ACL_F_EDIT', 'cat' => 'post'),
-		'acl_f_delete'		=> array('lang' => 'ACL_F_DELETE', 'cat' => 'post'),
-		'acl_f_ignoreflood' => array('lang' => 'ACL_F_IGNOREFLOOD', 'cat' => 'post'),
-		'acl_f_postcount'	=> array('lang' => 'ACL_F_POSTCOUNT', 'cat' => 'post'),
-		'acl_f_noapprove'	=> array('lang' => 'ACL_F_NOAPPROVE', 'cat' => 'post'),	
-
-		'acl_f_attach'		=> array('lang' => 'ACL_F_ATTACH', 'cat' => 'content'),	
-		'acl_f_icons'		=> array('lang' => 'ACL_F_ICONS', 'cat' => 'content'),
-		'acl_f_bbcode'		=> array('lang' => 'ACL_F_BBCODE', 'cat' => 'content'),	
-		'acl_f_flash'		=> array('lang' => 'ACL_F_FLASH', 'cat' => 'content'),
-		'acl_f_img'			=> array('lang' => 'ACL_F_IMG', 'cat' => 'content'),
-		'acl_f_sigs'		=> array('lang' => 'ACL_F_SIGS', 'cat' => 'content'),
-		'acl_f_smilies'		=> array('lang' => 'ACL_F_SMILIES', 'cat' => 'content'),
-
-		'acl_f_poll'		=> array('lang' => 'ACL_F_POLL', 'cat' => 'polls'),
-		'acl_f_vote'		=> array('lang' => 'ACL_F_VOTE', 'cat' => 'polls'),
-		'acl_f_votechg'		=> array('lang' => 'ACL_F_VOTECHG', 'cat' => 'polls'),
+		'f_list'		=> array('lang' => 'ACL_F_LIST', 'cat' => 'actions'),
+		'f_read'		=> array('lang' => 'ACL_F_READ', 'cat' => 'actions'),	
+		'f_search'		=> array('lang' => 'ACL_F_SEARCH', 'cat' => 'actions'),
+		'f_subscribe'	=> array('lang' => 'ACL_F_SUBSCRIBE', 'cat' => 'actions'),
+		'f_print'		=> array('lang' => 'ACL_F_PRINT', 'cat' => 'actions'),	
+		'f_email'		=> array('lang' => 'ACL_F_EMAIL', 'cat' => 'actions'),	
+		'f_bump'		=> array('lang' => 'ACL_F_BUMP', 'cat' => 'actions'),
+		'f_user_lock'	=> array('lang' => 'ACL_F_USER_LOCK', 'cat' => 'actions'),
+		'f_download'	=> array('lang' => 'ACL_F_DOWNLOAD', 'cat' => 'actions'),	
+		'f_report'		=> array('lang' => 'ACL_F_REPORT', 'cat' => 'actions'),
+
+		'f_post'		=> array('lang' => 'ACL_F_POST', 'cat' => 'post'),
+		'f_sticky'		=> array('lang' => 'ACL_F_STICKY', 'cat' => 'post'),
+		'f_announce'	=> array('lang' => 'ACL_F_ANNOUNCE', 'cat' => 'post'),
+		'f_reply'		=> array('lang' => 'ACL_F_REPLY', 'cat' => 'post'),
+		'f_edit'		=> array('lang' => 'ACL_F_EDIT', 'cat' => 'post'),
+		'f_delete'		=> array('lang' => 'ACL_F_DELETE', 'cat' => 'post'),
+		'f_ignoreflood' => array('lang' => 'ACL_F_IGNOREFLOOD', 'cat' => 'post'),
+		'f_postcount'	=> array('lang' => 'ACL_F_POSTCOUNT', 'cat' => 'post'),
+		'f_noapprove'	=> array('lang' => 'ACL_F_NOAPPROVE', 'cat' => 'post'),	
+
+		'f_attach'		=> array('lang' => 'ACL_F_ATTACH', 'cat' => 'content'),	
+		'f_icons'		=> array('lang' => 'ACL_F_ICONS', 'cat' => 'content'),
+		'f_bbcode'		=> array('lang' => 'ACL_F_BBCODE', 'cat' => 'content'),	
+		'f_flash'		=> array('lang' => 'ACL_F_FLASH', 'cat' => 'content'),
+		'f_img'			=> array('lang' => 'ACL_F_IMG', 'cat' => 'content'),
+		'f_sigs'		=> array('lang' => 'ACL_F_SIGS', 'cat' => 'content'),
+		'f_smilies'		=> array('lang' => 'ACL_F_SMILIES', 'cat' => 'content'),
+
+		'f_poll'		=> array('lang' => 'ACL_F_POLL', 'cat' => 'polls'),
+		'f_vote'		=> array('lang' => 'ACL_F_VOTE', 'cat' => 'polls'),
+		'f_votechg'		=> array('lang' => 'ACL_F_VOTECHG', 'cat' => 'polls'),
 
 		// Moderator Permissions
-		'acl_m_edit'		=> array('lang' => 'ACL_M_EDIT', 'cat' => 'post_actions'),
-		'acl_m_delete'		=> array('lang' => 'ACL_M_DELETE', 'cat' => 'post_actions'),
-		'acl_m_approve'		=> array('lang' => 'ACL_M_APPROVE', 'cat' => 'post_actions'),
-		'acl_m_report'		=> array('lang' => 'ACL_M_REPORT', 'cat' => 'post_actions'),
-		'acl_m_chgposter'	=> array('lang' => 'ACL_M_CHGPOSTER', 'cat' => 'post_actions'),
+		'm_edit'		=> array('lang' => 'ACL_M_EDIT', 'cat' => 'post_actions'),
+		'm_delete'		=> array('lang' => 'ACL_M_DELETE', 'cat' => 'post_actions'),
+		'm_approve'		=> array('lang' => 'ACL_M_APPROVE', 'cat' => 'post_actions'),
+		'm_report'		=> array('lang' => 'ACL_M_REPORT', 'cat' => 'post_actions'),
+		'm_chgposter'	=> array('lang' => 'ACL_M_CHGPOSTER', 'cat' => 'post_actions'),
 
-		'acl_m_move'	=> array('lang' => 'ACL_M_MOVE', 'cat' => 'topic_actions'),
-		'acl_m_lock'	=> array('lang' => 'ACL_M_LOCK', 'cat' => 'topic_actions'),
-		'acl_m_split'	=> array('lang' => 'ACL_M_SPLIT', 'cat' => 'topic_actions'),
-		'acl_m_merge'	=> array('lang' => 'ACL_M_MERGE', 'cat' => 'topic_actions'),
+		'm_move'	=> array('lang' => 'ACL_M_MOVE', 'cat' => 'topic_actions'),
+		'm_lock'	=> array('lang' => 'ACL_M_LOCK', 'cat' => 'topic_actions'),
+		'm_split'	=> array('lang' => 'ACL_M_SPLIT', 'cat' => 'topic_actions'),
+		'm_merge'	=> array('lang' => 'ACL_M_MERGE', 'cat' => 'topic_actions'),
 
-		'acl_m_info'	=> array('lang' => 'ACL_M_INFO', 'cat' => 'misc'),
-		'acl_m_warn'	=> array('lang' => 'ACL_M_WARN', 'cat' => 'misc'),
-		'acl_m_ban'		=> array('lang' => 'ACL_M_BAN', 'cat' => 'misc'),
+		'm_info'	=> array('lang' => 'ACL_M_INFO', 'cat' => 'misc'),
+		'm_warn'	=> array('lang' => 'ACL_M_WARN', 'cat' => 'misc'),
+		'm_ban'		=> array('lang' => 'ACL_M_BAN', 'cat' => 'misc'),
 
 		// Admin Permissions
-		'acl_a_board'		=> array('lang' => 'ACL_A_BOARD', 'cat' => 'settings'),
-		'acl_a_server'		=> array('lang' => 'ACL_A_SERVER', 'cat' => 'settings'),
-		'acl_a_jabber'		=> array('lang' => 'ACL_A_JABBER', 'cat' => 'settings'),
-		'acl_a_phpinfo'		=> array('lang' => 'ACL_A_PHPINFO', 'cat' => 'settings'),
-
-		'acl_a_forum'		=> array('lang' => 'ACL_A_FORUM', 'cat' => 'forums'),
-		'acl_a_forumadd'	=> array('lang' => 'ACL_A_FORUMADD', 'cat' => 'forums'),
-		'acl_a_forumdel'	=> array('lang' => 'ACL_A_FORUMDEL', 'cat' => 'forums'),
-		'acl_a_prune'		=> array('lang' => 'ACL_A_PRUNE', 'cat' => 'forums'),
-
-		'acl_a_icons'		=> array('lang' => 'ACL_A_ICONS', 'cat' => 'posting'),
-		'acl_a_words'		=> array('lang' => 'ACL_A_WORDS', 'cat' => 'posting'),
-		'acl_a_bbcode'		=> array('lang' => 'ACL_A_BBCODE', 'cat' => 'posting'),
-		'acl_a_attach'		=> array('lang' => 'ACL_A_ATTACH', 'cat' => 'posting'),
-
-		'acl_a_user'		=> array('lang' => 'ACL_A_USER', 'cat' => 'user_group'),
-		'acl_a_userdel'		=> array('lang' => 'ACL_A_USERDEL', 'cat' => 'user_group'),
-		'acl_a_group'		=> array('lang' => 'ACL_A_GROUP', 'cat' => 'user_group'),
-		'acl_a_groupadd'	=> array('lang' => 'ACL_A_GROUPADD', 'cat' => 'user_group'),
-		'acl_a_groupdel'	=> array('lang' => 'ACL_A_GROUPDEL', 'cat' => 'user_group'),
-		'acl_a_ranks'		=> array('lang' => 'ACL_A_RANKS', 'cat' => 'user_group'),
-		'acl_a_profile'		=> array('lang' => 'ACL_A_PROFILE', 'cat' => 'user_group'),
-		'acl_a_names'		=> array('lang' => 'ACL_A_NAMES', 'cat' => 'user_group'),
-		'acl_a_ban'			=> array('lang' => 'ACL_A_BAN', 'cat' => 'user_group'),
-
-		'acl_a_viewauth'	=> array('lang' => 'ACL_A_VIEWAUTH', 'cat' => 'permissions'),
-		'acl_a_authgroups'	=> array('lang' => 'ACL_A_AUTHGROUPS', 'cat' => 'permissions'),
-		'acl_a_authusers'	=> array('lang' => 'ACL_A_AUTHUSERS', 'cat' => 'permissions'),
-		'acl_a_fauth'		=> array('lang' => 'ACL_A_FAUTH', 'cat' => 'permissions'),
-		'acl_a_mauth'		=> array('lang' => 'ACL_A_MAUTH', 'cat' => 'permissions'),
-		'acl_a_aauth'		=> array('lang' => 'ACL_A_AAUTH', 'cat' => 'permissions'),
-		'acl_a_uauth'		=> array('lang' => 'ACL_A_UAUTH', 'cat' => 'permissions'),
-		'acl_a_roles'		=> array('lang' => 'ACL_A_ROLES', 'cat' => 'permissions'),
-		'acl_a_switchperm'	=> array('lang' => 'ACL_A_SWITCHPERM', 'cat' => 'permissions'),
-
-		'acl_a_styles'		=> array('lang' => 'ACL_A_STYLES', 'cat' => 'misc'),
-		'acl_a_extensions'	=> array('lang' => 'ACL_A_EXTENSIONS', 'cat' => 'misc'),
-		'acl_a_viewlogs'	=> array('lang' => 'ACL_A_VIEWLOGS', 'cat' => 'misc'),
-		'acl_a_clearlogs'	=> array('lang' => 'ACL_A_CLEARLOGS', 'cat' => 'misc'),
-		'acl_a_modules'		=> array('lang' => 'ACL_A_MODULES', 'cat' => 'misc'),
-		'acl_a_language'	=> array('lang' => 'ACL_A_LANGUAGE', 'cat' => 'misc'),
-		'acl_a_email'		=> array('lang' => 'ACL_A_EMAIL', 'cat' => 'misc'),
-		'acl_a_bots'		=> array('lang' => 'ACL_A_BOTS', 'cat' => 'misc'),
-		'acl_a_reasons'		=> array('lang' => 'ACL_A_REASONS', 'cat' => 'misc'),
-		'acl_a_backup'		=> array('lang' => 'ACL_A_BACKUP', 'cat' => 'misc'),
-		'acl_a_search'		=> array('lang' => 'ACL_A_SEARCH', 'cat' => 'misc'),
+		'a_board'		=> array('lang' => 'ACL_A_BOARD', 'cat' => 'settings'),
+		'a_server'		=> array('lang' => 'ACL_A_SERVER', 'cat' => 'settings'),
+		'a_jabber'		=> array('lang' => 'ACL_A_JABBER', 'cat' => 'settings'),
+		'a_phpinfo'		=> array('lang' => 'ACL_A_PHPINFO', 'cat' => 'settings'),
+
+		'a_forum'		=> array('lang' => 'ACL_A_FORUM', 'cat' => 'forums'),
+		'a_forumadd'	=> array('lang' => 'ACL_A_FORUMADD', 'cat' => 'forums'),
+		'a_forumdel'	=> array('lang' => 'ACL_A_FORUMDEL', 'cat' => 'forums'),
+		'a_prune'		=> array('lang' => 'ACL_A_PRUNE', 'cat' => 'forums'),
+
+		'a_icons'		=> array('lang' => 'ACL_A_ICONS', 'cat' => 'posting'),
+		'a_words'		=> array('lang' => 'ACL_A_WORDS', 'cat' => 'posting'),
+		'a_bbcode'		=> array('lang' => 'ACL_A_BBCODE', 'cat' => 'posting'),
+		'a_attach'		=> array('lang' => 'ACL_A_ATTACH', 'cat' => 'posting'),
+
+		'a_user'		=> array('lang' => 'ACL_A_USER', 'cat' => 'user_group'),
+		'a_userdel'		=> array('lang' => 'ACL_A_USERDEL', 'cat' => 'user_group'),
+		'a_group'		=> array('lang' => 'ACL_A_GROUP', 'cat' => 'user_group'),
+		'a_groupadd'	=> array('lang' => 'ACL_A_GROUPADD', 'cat' => 'user_group'),
+		'a_groupdel'	=> array('lang' => 'ACL_A_GROUPDEL', 'cat' => 'user_group'),
+		'a_ranks'		=> array('lang' => 'ACL_A_RANKS', 'cat' => 'user_group'),
+		'a_profile'		=> array('lang' => 'ACL_A_PROFILE', 'cat' => 'user_group'),
+		'a_names'		=> array('lang' => 'ACL_A_NAMES', 'cat' => 'user_group'),
+		'a_ban'			=> array('lang' => 'ACL_A_BAN', 'cat' => 'user_group'),
+
+		'a_viewauth'	=> array('lang' => 'ACL_A_VIEWAUTH', 'cat' => 'permissions'),
+		'a_authgroups'	=> array('lang' => 'ACL_A_AUTHGROUPS', 'cat' => 'permissions'),
+		'a_authusers'	=> array('lang' => 'ACL_A_AUTHUSERS', 'cat' => 'permissions'),
+		'a_fauth'		=> array('lang' => 'ACL_A_FAUTH', 'cat' => 'permissions'),
+		'a_mauth'		=> array('lang' => 'ACL_A_MAUTH', 'cat' => 'permissions'),
+		'a_aauth'		=> array('lang' => 'ACL_A_AAUTH', 'cat' => 'permissions'),
+		'a_uauth'		=> array('lang' => 'ACL_A_UAUTH', 'cat' => 'permissions'),
+		'a_roles'		=> array('lang' => 'ACL_A_ROLES', 'cat' => 'permissions'),
+		'a_switchperm'	=> array('lang' => 'ACL_A_SWITCHPERM', 'cat' => 'permissions'),
+
+		'a_styles'		=> array('lang' => 'ACL_A_STYLES', 'cat' => 'misc'),
+		'a_extensions'	=> array('lang' => 'ACL_A_EXTENSIONS', 'cat' => 'misc'),
+		'a_viewlogs'	=> array('lang' => 'ACL_A_VIEWLOGS', 'cat' => 'misc'),
+		'a_clearlogs'	=> array('lang' => 'ACL_A_CLEARLOGS', 'cat' => 'misc'),
+		'a_modules'		=> array('lang' => 'ACL_A_MODULES', 'cat' => 'misc'),
+		'a_language'	=> array('lang' => 'ACL_A_LANGUAGE', 'cat' => 'misc'),
+		'a_email'		=> array('lang' => 'ACL_A_EMAIL', 'cat' => 'misc'),
+		'a_bots'		=> array('lang' => 'ACL_A_BOTS', 'cat' => 'misc'),
+		'a_reasons'		=> array('lang' => 'ACL_A_REASONS', 'cat' => 'misc'),
+		'a_backup'		=> array('lang' => 'ACL_A_BACKUP', 'cat' => 'misc'),
+		'a_search'		=> array('lang' => 'ACL_A_SEARCH', 'cat' => 'misc'),
 	);
 }
-- 
cgit v1.2.1


From 4b7b7e895b4a0949d19a7524bedddfa969a33ee7 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 10 Jul 2013 16:44:24 +0200
Subject: [ticket/11582] Fix missing @params in the doc blocks

PHPBB3-11582
---
 phpBB/includes/permissions.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/phpBB/includes/permissions.php b/phpBB/includes/permissions.php
index 1db6843dbb..66360424ea 100644
--- a/phpBB/includes/permissions.php
+++ b/phpBB/includes/permissions.php
@@ -86,7 +86,8 @@ class phpbb_permissions
 	/**
 	* Returns the language string of a permission category
 	*
-	* @return	string	Language string
+	* @param	string	$category	Identifier of the category
+	* @return	string		Language string
 	*/
 	public function get_category_lang($category)
 	{
@@ -106,6 +107,8 @@ class phpbb_permissions
 	/**
 	* Returns the language string of a permission type
 	*
+	* @param	string	$type	Identifier of the type
+	* @param	mixed	$scope	Scope of the type (should be 'global', 'local' or false)
 	* @return	string	Language string
 	*/
 	public function get_type_lang($type, $scope = false)
@@ -151,7 +154,8 @@ class phpbb_permissions
 	/**
 	* Returns the category of a permission
 	*
-	* @return	string
+	* @param	string	$permission	Identifier of the permission
+	* @return	string		Returns the category identifier of the permission
 	*/
 	public function get_permission_category($permission)
 	{
@@ -161,6 +165,7 @@ class phpbb_permissions
 	/**
 	* Returns the language string of a permission
 	*
+	* @param	string	$permission	Identifier of the permission
 	* @return	string	Language string
 	*/
 	public function get_permission_lang($permission)
-- 
cgit v1.2.1


From 060754fd6ce998caf8b8e182f53a1464e16e9deb Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 12 Jul 2013 00:05:48 -0400
Subject: [ticket/11582] Fix missing closing bracket

PHPBB3-11582
---
 phpBB/includes/acp/acp_permission_roles.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/phpBB/includes/acp/acp_permission_roles.php b/phpBB/includes/acp/acp_permission_roles.php
index 7c972c74ba..5657cbe675 100644
--- a/phpBB/includes/acp/acp_permission_roles.php
+++ b/phpBB/includes/acp/acp_permission_roles.php
@@ -492,8 +492,8 @@ class acp_permission_roles
 					'S_NO'		=> ($allowed == ACL_NO) ? true : false,
 
 					'FIELD_NAME'	=> $permission,
-					'PERMISSION'	=> $phpbb_permissions->get_permission_lang($permission)
-				);
+					'PERMISSION'	=> $phpbb_permissions->get_permission_lang($permission),
+				));
 			}
 		}
 	}
-- 
cgit v1.2.1


From cfb13bb5476dfa7895f984405d6a0c40ddcda08e Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sat, 13 Jul 2013 23:31:13 -0400
Subject: [ticket/11582] Fix extension permission tests

PHPBB3-11582
---
 .../ext/foo/bar/event/permission_listener.php      | 40 ++++++++++++++++++++++
 .../ext/foo/bar/language/en/permissions_foo.php    |  3 +-
 2 files changed, 41 insertions(+), 2 deletions(-)
 create mode 100644 tests/functional/fixtures/ext/foo/bar/event/permission_listener.php

diff --git a/tests/functional/fixtures/ext/foo/bar/event/permission_listener.php b/tests/functional/fixtures/ext/foo/bar/event/permission_listener.php
new file mode 100644
index 0000000000..dfabf7c540
--- /dev/null
+++ b/tests/functional/fixtures/ext/foo/bar/event/permission_listener.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+*
+* @package testing
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Event listener
+*/
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+class phpbb_ext_foo_bar_event_permission_listener implements EventSubscriberInterface
+{
+	static public function getSubscribedEvents()
+	{
+		return array(
+			'core.permissions'	=> 'add_permissions',
+		);
+	}
+
+	public function add_permissions($event)
+	{
+		$permissions = $event['permissions'];
+		$permissions['u_foo'] = array('lang' => 'ACL_U_FOO', 'cat' => 'misc'),
+		$event['permissions'] = $permissions;
+	}
+}
diff --git a/tests/functional/fixtures/ext/foo/bar/language/en/permissions_foo.php b/tests/functional/fixtures/ext/foo/bar/language/en/permissions_foo.php
index cd4b9a32d1..36c84c5209 100644
--- a/tests/functional/fixtures/ext/foo/bar/language/en/permissions_foo.php
+++ b/tests/functional/fixtures/ext/foo/bar/language/en/permissions_foo.php
@@ -1,6 +1,5 @@
 <?php
 
-// Admin Permissions
 $lang = array_merge($lang, array(
-    'acl_u_foo'    => array('lang' => 'Can view foo', 'cat' => 'misc'),
+	'ACL_U_FOO'		=> 'Can view foo',
 ));
-- 
cgit v1.2.1


From 9c72bbe284514c1aa70f8ac65e9dfcafb72d36dd Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sun, 14 Jul 2013 12:04:04 -0400
Subject: [ticket/11582] Move file to new directory

PHPBB3-11582
---
 phpBB/includes/permissions.php | 340 -----------------------------------------
 phpBB/phpbb/permissions.php    | 340 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 340 insertions(+), 340 deletions(-)
 delete mode 100644 phpBB/includes/permissions.php
 create mode 100644 phpBB/phpbb/permissions.php

diff --git a/phpBB/includes/permissions.php b/phpBB/includes/permissions.php
deleted file mode 100644
index 66360424ea..0000000000
--- a/phpBB/includes/permissions.php
+++ /dev/null
@@ -1,340 +0,0 @@
-<?php
-/**
-*
-* @package phpBB3
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* DO NOT CHANGE
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-class phpbb_permissions
-{
-	/**
-	* Event dispatcher object
-	* @var phpbb_event_dispatcher
-	*/
-	protected $dispatcher;
-
-	/**
-	* User object
-	* @var phpbb_user
-	*/
-	protected $user;
-
-	/**
-	* Constructor
-	*
-	* @param	phpbb_event_dispatcher	$phpbb_dispatcher	Event dispatcher
-	* @param	phpbb_user				$user				User Object
-	* @return	null
-	*/
-	public function __construct(phpbb_event_dispatcher $phpbb_dispatcher, phpbb_user $user)
-	{
-		$this->dispatcher = $phpbb_dispatcher;
-		$this->user = $user;
-
-		$categories = $this->categories;
-		$types = $this->types;
-		$permissions = $this->permissions;
-
-		/**
-		* Allows to specify additional permission categories, types and permissions
-		*
-		* @event core.permissions
-		* @var	array	types			Array with permission types (a_, u_, m_, etc.)
-		* @var	array	categories		Array with permission categories (pm, post, settings, misc, etc.)
-		* @var	array	permissions		Array with permissions. Each Permission has the following layout:
-		*		'<type><permission>' => array(
-		*			'lang'	=> 'Language Key with a Short description', // Optional, if not set,
-		*						// the permissions identifier '<type><permission>' is used with
-		*						// all uppercase.
-		*			'cat'	=> 'Identifier of the category, the permission should be displayed in',
-		*		),
-		*		Example:
-		*		'u_viewprofile' => array(
-		*			'lang'	=> 'ACL_U_VIEWPROFILE',
-		*			'cat'	=> 'profile',
-		*		),
-		* @since 3.1-A1
-		*/
-		$vars = array('types', 'categories', 'permissions');
-		extract($phpbb_dispatcher->trigger_event('core.permissions', $vars));
-
-		$this->categories = $categories;
-		$this->types = $types;
-		$this->permissions = $permissions;
-	}
-
-	/**
-	* Returns an array with all the permission categories (pm, post, settings, misc, etc.)
-	*
-	* @return	array	Layout: cat-identifier => Language key
-	*/
-	public function get_categories()
-	{
-		return $this->categories;
-	}
-
-	/**
-	* Returns the language string of a permission category
-	*
-	* @param	string	$category	Identifier of the category
-	* @return	string		Language string
-	*/
-	public function get_category_lang($category)
-	{
-		return $this->user->lang($this->categories[$category]);
-	}
-
-	/**
-	* Returns an array with all the permission types (a_, u_, m_, etc.)
-	*
-	* @return	array	Layout: type-identifier => Language key
-	*/
-	public function get_types()
-	{
-		return $this->types;
-	}
-
-	/**
-	* Returns the language string of a permission type
-	*
-	* @param	string	$type	Identifier of the type
-	* @param	mixed	$scope	Scope of the type (should be 'global', 'local' or false)
-	* @return	string	Language string
-	*/
-	public function get_type_lang($type, $scope = false)
-	{
-		if ($scope && isset($this->types[$scope][$type]))
-		{
-			$lang_key = $this->types[$scope][$type];
-		}
-		else if (isset($this->types[$type]))
-		{
-			$lang_key = $this->types[$type];
-		}
-		else
-		{
-			$lang_key = 'ACL_TYPE_' . strtoupper(($scope) ? $scope . '_' . $type : $type);
-		}
-
-		return $this->user->lang($lang_key);
-	}
-
-	/**
-	* Returns an array with all the permissions.
-	* Each Permission has the following layout:
-	*	'<type><permission>' => array(
-	*		'lang'	=> 'Language Key with a Short description', // Optional, if not set,
-	*					// the permissions identifier '<type><permission>' is used with
-	*					// all uppercase.
-	*		'cat'	=> 'Identifier of the category, the permission should be displayed in',
-	*	),
-	*	Example:
-	*	'u_viewprofile' => array(
-	*		'lang'	=> 'ACL_U_VIEWPROFILE',
-	*		'cat'	=> 'profile',
-	*	),
-	*
-	* @return	array
-	*/
-	public function get_permissions()
-	{
-		return $this->permissions;
-	}
-
-	/**
-	* Returns the category of a permission
-	*
-	* @param	string	$permission	Identifier of the permission
-	* @return	string		Returns the category identifier of the permission
-	*/
-	public function get_permission_category($permission)
-	{
-		return (isset($this->permissions[$permission]['cat'])) ? $this->permissions[$permission]['cat'] : 'misc';
-	}
-
-	/**
-	* Returns the language string of a permission
-	*
-	* @param	string	$permission	Identifier of the permission
-	* @return	string	Language string
-	*/
-	public function get_permission_lang($permission)
-	{
-		return (isset($this->permissions[$permission]['lang'])) ? $this->user->lang($this->permissions[$permission]['lang']) : $this->user->lang('ACL_' . strtoupper($permission));
-	}
-
-	protected $types = array(
-		'u_'			=> 'ACL_TYPE_U_',
-		'a_'			=> 'ACL_TYPE_A_',
-		'm_'			=> 'ACL_TYPE_M_',
-		'f_'			=> 'ACL_TYPE_F_',
-		'global'		=> array(
-			'm_'			=> 'ACL_TYPE_GLOBAL_M_',
-		),
-	);
-
-	protected $categories = array(
-		'actions'		=> 'ACL_CAT_ACTIONS',
-		'content'		=> 'ACL_CAT_CONTENT',
-		'forums'		=> 'ACL_CAT_FORUMS',
-		'misc'			=> 'ACL_CAT_MISC',
-		'permissions'	=> 'ACL_CAT_PERMISSIONS',
-		'pm'			=> 'ACL_CAT_PM',
-		'polls'			=> 'ACL_CAT_POLLS',
-		'post'			=> 'ACL_CAT_POST',
-		'post_actions'	=> 'ACL_CAT_POST_ACTIONS',
-		'posting'		=> 'ACL_CAT_POSTING',
-		'profile'		=> 'ACL_CAT_PROFILE',
-		'settings'		=> 'ACL_CAT_SETTINGS',
-		'topic_actions'	=> 'ACL_CAT_TOPIC_ACTIONS',
-		'user_group'	=> 'ACL_CAT_USER_GROUP',
-	);
-
-	protected $permissions = array(
-		// User Permissions
-		'u_viewprofile'	=> array('lang' => 'ACL_U_VIEWPROFILE', 'cat' => 'profile'),
-		'u_chgname'		=> array('lang' => 'ACL_U_CHGNAME', 'cat' => 'profile'),
-		'u_chgpasswd'	=> array('lang' => 'ACL_U_CHGPASSWD', 'cat' => 'profile'),
-		'u_chgemail'	=> array('lang' => 'ACL_U_CHGEMAIL', 'cat' => 'profile'),
-		'u_chgavatar'	=> array('lang' => 'ACL_U_CHGAVATAR', 'cat' => 'profile'),
-		'u_chggrp'		=> array('lang' => 'ACL_U_CHGGRP', 'cat' => 'profile'),
-		'u_chgprofileinfo'	=> array('lang' => 'ACL_U_CHGPROFILEINFO', 'cat' => 'profile'),
-
-		'u_attach'		=> array('lang' => 'ACL_U_ATTACH', 'cat' => 'post'),
-		'u_download'	=> array('lang' => 'ACL_U_DOWNLOAD', 'cat' => 'post'),
-		'u_savedrafts'	=> array('lang' => 'ACL_U_SAVEDRAFTS', 'cat' => 'post'),
-		'u_chgcensors'	=> array('lang' => 'ACL_U_CHGCENSORS', 'cat' => 'post'),
-		'u_sig'			=> array('lang' => 'ACL_U_SIG', 'cat' => 'post'),
-
-		'u_sendpm'		=> array('lang' => 'ACL_U_SENDPM', 'cat' => 'pm'),
-		'u_masspm'		=> array('lang' => 'ACL_U_MASSPM', 'cat' => 'pm'),
-		'u_masspm_group'=> array('lang' => 'ACL_U_MASSPM_GROUP', 'cat' => 'pm'),
-		'u_readpm'		=> array('lang' => 'ACL_U_READPM', 'cat' => 'pm'),
-		'u_pm_edit'		=> array('lang' => 'ACL_U_PM_EDIT', 'cat' => 'pm'),
-		'u_pm_delete'	=> array('lang' => 'ACL_U_PM_DELETE', 'cat' => 'pm'),
-		'u_pm_forward'	=> array('lang' => 'ACL_U_PM_FORWARD', 'cat' => 'pm'),
-		'u_pm_emailpm'	=> array('lang' => 'ACL_U_PM_EMAILPM', 'cat' => 'pm'),
-		'u_pm_printpm'	=> array('lang' => 'ACL_U_PM_PRINTPM', 'cat' => 'pm'),
-		'u_pm_attach'	=> array('lang' => 'ACL_U_PM_ATTACH', 'cat' => 'pm'),
-		'u_pm_download'	=> array('lang' => 'ACL_U_PM_DOWNLOAD', 'cat' => 'pm'),
-		'u_pm_bbcode'	=> array('lang' => 'ACL_U_PM_BBCODE', 'cat' => 'pm'),
-		'u_pm_smilies'	=> array('lang' => 'ACL_U_PM_SMILIES', 'cat' => 'pm'),
-		'u_pm_img'		=> array('lang' => 'ACL_U_PM_IMG', 'cat' => 'pm'),
-		'u_pm_flash'	=> array('lang' => 'ACL_U_PM_FLASH', 'cat' => 'pm'),
-
-		'u_sendemail'	=> array('lang' => 'ACL_U_SENDEMAIL', 'cat' => 'misc'),
-		'u_sendim'		=> array('lang' => 'ACL_U_SENDIM', 'cat' => 'misc'),
-		'u_ignoreflood'	=> array('lang' => 'ACL_U_IGNOREFLOOD', 'cat' => 'misc'),
-		'u_hideonline'	=> array('lang' => 'ACL_U_HIDEONLINE', 'cat' => 'misc'),
-		'u_viewonline'	=> array('lang' => 'ACL_U_VIEWONLINE', 'cat' => 'misc'),
-		'u_search'		=> array('lang' => 'ACL_U_SEARCH', 'cat' => 'misc'),
-
-		// Forum Permissions
-		'f_list'		=> array('lang' => 'ACL_F_LIST', 'cat' => 'actions'),
-		'f_read'		=> array('lang' => 'ACL_F_READ', 'cat' => 'actions'),	
-		'f_search'		=> array('lang' => 'ACL_F_SEARCH', 'cat' => 'actions'),
-		'f_subscribe'	=> array('lang' => 'ACL_F_SUBSCRIBE', 'cat' => 'actions'),
-		'f_print'		=> array('lang' => 'ACL_F_PRINT', 'cat' => 'actions'),	
-		'f_email'		=> array('lang' => 'ACL_F_EMAIL', 'cat' => 'actions'),	
-		'f_bump'		=> array('lang' => 'ACL_F_BUMP', 'cat' => 'actions'),
-		'f_user_lock'	=> array('lang' => 'ACL_F_USER_LOCK', 'cat' => 'actions'),
-		'f_download'	=> array('lang' => 'ACL_F_DOWNLOAD', 'cat' => 'actions'),	
-		'f_report'		=> array('lang' => 'ACL_F_REPORT', 'cat' => 'actions'),
-
-		'f_post'		=> array('lang' => 'ACL_F_POST', 'cat' => 'post'),
-		'f_sticky'		=> array('lang' => 'ACL_F_STICKY', 'cat' => 'post'),
-		'f_announce'	=> array('lang' => 'ACL_F_ANNOUNCE', 'cat' => 'post'),
-		'f_reply'		=> array('lang' => 'ACL_F_REPLY', 'cat' => 'post'),
-		'f_edit'		=> array('lang' => 'ACL_F_EDIT', 'cat' => 'post'),
-		'f_delete'		=> array('lang' => 'ACL_F_DELETE', 'cat' => 'post'),
-		'f_ignoreflood' => array('lang' => 'ACL_F_IGNOREFLOOD', 'cat' => 'post'),
-		'f_postcount'	=> array('lang' => 'ACL_F_POSTCOUNT', 'cat' => 'post'),
-		'f_noapprove'	=> array('lang' => 'ACL_F_NOAPPROVE', 'cat' => 'post'),	
-
-		'f_attach'		=> array('lang' => 'ACL_F_ATTACH', 'cat' => 'content'),	
-		'f_icons'		=> array('lang' => 'ACL_F_ICONS', 'cat' => 'content'),
-		'f_bbcode'		=> array('lang' => 'ACL_F_BBCODE', 'cat' => 'content'),	
-		'f_flash'		=> array('lang' => 'ACL_F_FLASH', 'cat' => 'content'),
-		'f_img'			=> array('lang' => 'ACL_F_IMG', 'cat' => 'content'),
-		'f_sigs'		=> array('lang' => 'ACL_F_SIGS', 'cat' => 'content'),
-		'f_smilies'		=> array('lang' => 'ACL_F_SMILIES', 'cat' => 'content'),
-
-		'f_poll'		=> array('lang' => 'ACL_F_POLL', 'cat' => 'polls'),
-		'f_vote'		=> array('lang' => 'ACL_F_VOTE', 'cat' => 'polls'),
-		'f_votechg'		=> array('lang' => 'ACL_F_VOTECHG', 'cat' => 'polls'),
-
-		// Moderator Permissions
-		'm_edit'		=> array('lang' => 'ACL_M_EDIT', 'cat' => 'post_actions'),
-		'm_delete'		=> array('lang' => 'ACL_M_DELETE', 'cat' => 'post_actions'),
-		'm_approve'		=> array('lang' => 'ACL_M_APPROVE', 'cat' => 'post_actions'),
-		'm_report'		=> array('lang' => 'ACL_M_REPORT', 'cat' => 'post_actions'),
-		'm_chgposter'	=> array('lang' => 'ACL_M_CHGPOSTER', 'cat' => 'post_actions'),
-
-		'm_move'	=> array('lang' => 'ACL_M_MOVE', 'cat' => 'topic_actions'),
-		'm_lock'	=> array('lang' => 'ACL_M_LOCK', 'cat' => 'topic_actions'),
-		'm_split'	=> array('lang' => 'ACL_M_SPLIT', 'cat' => 'topic_actions'),
-		'm_merge'	=> array('lang' => 'ACL_M_MERGE', 'cat' => 'topic_actions'),
-
-		'm_info'	=> array('lang' => 'ACL_M_INFO', 'cat' => 'misc'),
-		'm_warn'	=> array('lang' => 'ACL_M_WARN', 'cat' => 'misc'),
-		'm_ban'		=> array('lang' => 'ACL_M_BAN', 'cat' => 'misc'),
-
-		// Admin Permissions
-		'a_board'		=> array('lang' => 'ACL_A_BOARD', 'cat' => 'settings'),
-		'a_server'		=> array('lang' => 'ACL_A_SERVER', 'cat' => 'settings'),
-		'a_jabber'		=> array('lang' => 'ACL_A_JABBER', 'cat' => 'settings'),
-		'a_phpinfo'		=> array('lang' => 'ACL_A_PHPINFO', 'cat' => 'settings'),
-
-		'a_forum'		=> array('lang' => 'ACL_A_FORUM', 'cat' => 'forums'),
-		'a_forumadd'	=> array('lang' => 'ACL_A_FORUMADD', 'cat' => 'forums'),
-		'a_forumdel'	=> array('lang' => 'ACL_A_FORUMDEL', 'cat' => 'forums'),
-		'a_prune'		=> array('lang' => 'ACL_A_PRUNE', 'cat' => 'forums'),
-
-		'a_icons'		=> array('lang' => 'ACL_A_ICONS', 'cat' => 'posting'),
-		'a_words'		=> array('lang' => 'ACL_A_WORDS', 'cat' => 'posting'),
-		'a_bbcode'		=> array('lang' => 'ACL_A_BBCODE', 'cat' => 'posting'),
-		'a_attach'		=> array('lang' => 'ACL_A_ATTACH', 'cat' => 'posting'),
-
-		'a_user'		=> array('lang' => 'ACL_A_USER', 'cat' => 'user_group'),
-		'a_userdel'		=> array('lang' => 'ACL_A_USERDEL', 'cat' => 'user_group'),
-		'a_group'		=> array('lang' => 'ACL_A_GROUP', 'cat' => 'user_group'),
-		'a_groupadd'	=> array('lang' => 'ACL_A_GROUPADD', 'cat' => 'user_group'),
-		'a_groupdel'	=> array('lang' => 'ACL_A_GROUPDEL', 'cat' => 'user_group'),
-		'a_ranks'		=> array('lang' => 'ACL_A_RANKS', 'cat' => 'user_group'),
-		'a_profile'		=> array('lang' => 'ACL_A_PROFILE', 'cat' => 'user_group'),
-		'a_names'		=> array('lang' => 'ACL_A_NAMES', 'cat' => 'user_group'),
-		'a_ban'			=> array('lang' => 'ACL_A_BAN', 'cat' => 'user_group'),
-
-		'a_viewauth'	=> array('lang' => 'ACL_A_VIEWAUTH', 'cat' => 'permissions'),
-		'a_authgroups'	=> array('lang' => 'ACL_A_AUTHGROUPS', 'cat' => 'permissions'),
-		'a_authusers'	=> array('lang' => 'ACL_A_AUTHUSERS', 'cat' => 'permissions'),
-		'a_fauth'		=> array('lang' => 'ACL_A_FAUTH', 'cat' => 'permissions'),
-		'a_mauth'		=> array('lang' => 'ACL_A_MAUTH', 'cat' => 'permissions'),
-		'a_aauth'		=> array('lang' => 'ACL_A_AAUTH', 'cat' => 'permissions'),
-		'a_uauth'		=> array('lang' => 'ACL_A_UAUTH', 'cat' => 'permissions'),
-		'a_roles'		=> array('lang' => 'ACL_A_ROLES', 'cat' => 'permissions'),
-		'a_switchperm'	=> array('lang' => 'ACL_A_SWITCHPERM', 'cat' => 'permissions'),
-
-		'a_styles'		=> array('lang' => 'ACL_A_STYLES', 'cat' => 'misc'),
-		'a_extensions'	=> array('lang' => 'ACL_A_EXTENSIONS', 'cat' => 'misc'),
-		'a_viewlogs'	=> array('lang' => 'ACL_A_VIEWLOGS', 'cat' => 'misc'),
-		'a_clearlogs'	=> array('lang' => 'ACL_A_CLEARLOGS', 'cat' => 'misc'),
-		'a_modules'		=> array('lang' => 'ACL_A_MODULES', 'cat' => 'misc'),
-		'a_language'	=> array('lang' => 'ACL_A_LANGUAGE', 'cat' => 'misc'),
-		'a_email'		=> array('lang' => 'ACL_A_EMAIL', 'cat' => 'misc'),
-		'a_bots'		=> array('lang' => 'ACL_A_BOTS', 'cat' => 'misc'),
-		'a_reasons'		=> array('lang' => 'ACL_A_REASONS', 'cat' => 'misc'),
-		'a_backup'		=> array('lang' => 'ACL_A_BACKUP', 'cat' => 'misc'),
-		'a_search'		=> array('lang' => 'ACL_A_SEARCH', 'cat' => 'misc'),
-	);
-}
diff --git a/phpBB/phpbb/permissions.php b/phpBB/phpbb/permissions.php
new file mode 100644
index 0000000000..66360424ea
--- /dev/null
+++ b/phpBB/phpbb/permissions.php
@@ -0,0 +1,340 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+class phpbb_permissions
+{
+	/**
+	* Event dispatcher object
+	* @var phpbb_event_dispatcher
+	*/
+	protected $dispatcher;
+
+	/**
+	* User object
+	* @var phpbb_user
+	*/
+	protected $user;
+
+	/**
+	* Constructor
+	*
+	* @param	phpbb_event_dispatcher	$phpbb_dispatcher	Event dispatcher
+	* @param	phpbb_user				$user				User Object
+	* @return	null
+	*/
+	public function __construct(phpbb_event_dispatcher $phpbb_dispatcher, phpbb_user $user)
+	{
+		$this->dispatcher = $phpbb_dispatcher;
+		$this->user = $user;
+
+		$categories = $this->categories;
+		$types = $this->types;
+		$permissions = $this->permissions;
+
+		/**
+		* Allows to specify additional permission categories, types and permissions
+		*
+		* @event core.permissions
+		* @var	array	types			Array with permission types (a_, u_, m_, etc.)
+		* @var	array	categories		Array with permission categories (pm, post, settings, misc, etc.)
+		* @var	array	permissions		Array with permissions. Each Permission has the following layout:
+		*		'<type><permission>' => array(
+		*			'lang'	=> 'Language Key with a Short description', // Optional, if not set,
+		*						// the permissions identifier '<type><permission>' is used with
+		*						// all uppercase.
+		*			'cat'	=> 'Identifier of the category, the permission should be displayed in',
+		*		),
+		*		Example:
+		*		'u_viewprofile' => array(
+		*			'lang'	=> 'ACL_U_VIEWPROFILE',
+		*			'cat'	=> 'profile',
+		*		),
+		* @since 3.1-A1
+		*/
+		$vars = array('types', 'categories', 'permissions');
+		extract($phpbb_dispatcher->trigger_event('core.permissions', $vars));
+
+		$this->categories = $categories;
+		$this->types = $types;
+		$this->permissions = $permissions;
+	}
+
+	/**
+	* Returns an array with all the permission categories (pm, post, settings, misc, etc.)
+	*
+	* @return	array	Layout: cat-identifier => Language key
+	*/
+	public function get_categories()
+	{
+		return $this->categories;
+	}
+
+	/**
+	* Returns the language string of a permission category
+	*
+	* @param	string	$category	Identifier of the category
+	* @return	string		Language string
+	*/
+	public function get_category_lang($category)
+	{
+		return $this->user->lang($this->categories[$category]);
+	}
+
+	/**
+	* Returns an array with all the permission types (a_, u_, m_, etc.)
+	*
+	* @return	array	Layout: type-identifier => Language key
+	*/
+	public function get_types()
+	{
+		return $this->types;
+	}
+
+	/**
+	* Returns the language string of a permission type
+	*
+	* @param	string	$type	Identifier of the type
+	* @param	mixed	$scope	Scope of the type (should be 'global', 'local' or false)
+	* @return	string	Language string
+	*/
+	public function get_type_lang($type, $scope = false)
+	{
+		if ($scope && isset($this->types[$scope][$type]))
+		{
+			$lang_key = $this->types[$scope][$type];
+		}
+		else if (isset($this->types[$type]))
+		{
+			$lang_key = $this->types[$type];
+		}
+		else
+		{
+			$lang_key = 'ACL_TYPE_' . strtoupper(($scope) ? $scope . '_' . $type : $type);
+		}
+
+		return $this->user->lang($lang_key);
+	}
+
+	/**
+	* Returns an array with all the permissions.
+	* Each Permission has the following layout:
+	*	'<type><permission>' => array(
+	*		'lang'	=> 'Language Key with a Short description', // Optional, if not set,
+	*					// the permissions identifier '<type><permission>' is used with
+	*					// all uppercase.
+	*		'cat'	=> 'Identifier of the category, the permission should be displayed in',
+	*	),
+	*	Example:
+	*	'u_viewprofile' => array(
+	*		'lang'	=> 'ACL_U_VIEWPROFILE',
+	*		'cat'	=> 'profile',
+	*	),
+	*
+	* @return	array
+	*/
+	public function get_permissions()
+	{
+		return $this->permissions;
+	}
+
+	/**
+	* Returns the category of a permission
+	*
+	* @param	string	$permission	Identifier of the permission
+	* @return	string		Returns the category identifier of the permission
+	*/
+	public function get_permission_category($permission)
+	{
+		return (isset($this->permissions[$permission]['cat'])) ? $this->permissions[$permission]['cat'] : 'misc';
+	}
+
+	/**
+	* Returns the language string of a permission
+	*
+	* @param	string	$permission	Identifier of the permission
+	* @return	string	Language string
+	*/
+	public function get_permission_lang($permission)
+	{
+		return (isset($this->permissions[$permission]['lang'])) ? $this->user->lang($this->permissions[$permission]['lang']) : $this->user->lang('ACL_' . strtoupper($permission));
+	}
+
+	protected $types = array(
+		'u_'			=> 'ACL_TYPE_U_',
+		'a_'			=> 'ACL_TYPE_A_',
+		'm_'			=> 'ACL_TYPE_M_',
+		'f_'			=> 'ACL_TYPE_F_',
+		'global'		=> array(
+			'm_'			=> 'ACL_TYPE_GLOBAL_M_',
+		),
+	);
+
+	protected $categories = array(
+		'actions'		=> 'ACL_CAT_ACTIONS',
+		'content'		=> 'ACL_CAT_CONTENT',
+		'forums'		=> 'ACL_CAT_FORUMS',
+		'misc'			=> 'ACL_CAT_MISC',
+		'permissions'	=> 'ACL_CAT_PERMISSIONS',
+		'pm'			=> 'ACL_CAT_PM',
+		'polls'			=> 'ACL_CAT_POLLS',
+		'post'			=> 'ACL_CAT_POST',
+		'post_actions'	=> 'ACL_CAT_POST_ACTIONS',
+		'posting'		=> 'ACL_CAT_POSTING',
+		'profile'		=> 'ACL_CAT_PROFILE',
+		'settings'		=> 'ACL_CAT_SETTINGS',
+		'topic_actions'	=> 'ACL_CAT_TOPIC_ACTIONS',
+		'user_group'	=> 'ACL_CAT_USER_GROUP',
+	);
+
+	protected $permissions = array(
+		// User Permissions
+		'u_viewprofile'	=> array('lang' => 'ACL_U_VIEWPROFILE', 'cat' => 'profile'),
+		'u_chgname'		=> array('lang' => 'ACL_U_CHGNAME', 'cat' => 'profile'),
+		'u_chgpasswd'	=> array('lang' => 'ACL_U_CHGPASSWD', 'cat' => 'profile'),
+		'u_chgemail'	=> array('lang' => 'ACL_U_CHGEMAIL', 'cat' => 'profile'),
+		'u_chgavatar'	=> array('lang' => 'ACL_U_CHGAVATAR', 'cat' => 'profile'),
+		'u_chggrp'		=> array('lang' => 'ACL_U_CHGGRP', 'cat' => 'profile'),
+		'u_chgprofileinfo'	=> array('lang' => 'ACL_U_CHGPROFILEINFO', 'cat' => 'profile'),
+
+		'u_attach'		=> array('lang' => 'ACL_U_ATTACH', 'cat' => 'post'),
+		'u_download'	=> array('lang' => 'ACL_U_DOWNLOAD', 'cat' => 'post'),
+		'u_savedrafts'	=> array('lang' => 'ACL_U_SAVEDRAFTS', 'cat' => 'post'),
+		'u_chgcensors'	=> array('lang' => 'ACL_U_CHGCENSORS', 'cat' => 'post'),
+		'u_sig'			=> array('lang' => 'ACL_U_SIG', 'cat' => 'post'),
+
+		'u_sendpm'		=> array('lang' => 'ACL_U_SENDPM', 'cat' => 'pm'),
+		'u_masspm'		=> array('lang' => 'ACL_U_MASSPM', 'cat' => 'pm'),
+		'u_masspm_group'=> array('lang' => 'ACL_U_MASSPM_GROUP', 'cat' => 'pm'),
+		'u_readpm'		=> array('lang' => 'ACL_U_READPM', 'cat' => 'pm'),
+		'u_pm_edit'		=> array('lang' => 'ACL_U_PM_EDIT', 'cat' => 'pm'),
+		'u_pm_delete'	=> array('lang' => 'ACL_U_PM_DELETE', 'cat' => 'pm'),
+		'u_pm_forward'	=> array('lang' => 'ACL_U_PM_FORWARD', 'cat' => 'pm'),
+		'u_pm_emailpm'	=> array('lang' => 'ACL_U_PM_EMAILPM', 'cat' => 'pm'),
+		'u_pm_printpm'	=> array('lang' => 'ACL_U_PM_PRINTPM', 'cat' => 'pm'),
+		'u_pm_attach'	=> array('lang' => 'ACL_U_PM_ATTACH', 'cat' => 'pm'),
+		'u_pm_download'	=> array('lang' => 'ACL_U_PM_DOWNLOAD', 'cat' => 'pm'),
+		'u_pm_bbcode'	=> array('lang' => 'ACL_U_PM_BBCODE', 'cat' => 'pm'),
+		'u_pm_smilies'	=> array('lang' => 'ACL_U_PM_SMILIES', 'cat' => 'pm'),
+		'u_pm_img'		=> array('lang' => 'ACL_U_PM_IMG', 'cat' => 'pm'),
+		'u_pm_flash'	=> array('lang' => 'ACL_U_PM_FLASH', 'cat' => 'pm'),
+
+		'u_sendemail'	=> array('lang' => 'ACL_U_SENDEMAIL', 'cat' => 'misc'),
+		'u_sendim'		=> array('lang' => 'ACL_U_SENDIM', 'cat' => 'misc'),
+		'u_ignoreflood'	=> array('lang' => 'ACL_U_IGNOREFLOOD', 'cat' => 'misc'),
+		'u_hideonline'	=> array('lang' => 'ACL_U_HIDEONLINE', 'cat' => 'misc'),
+		'u_viewonline'	=> array('lang' => 'ACL_U_VIEWONLINE', 'cat' => 'misc'),
+		'u_search'		=> array('lang' => 'ACL_U_SEARCH', 'cat' => 'misc'),
+
+		// Forum Permissions
+		'f_list'		=> array('lang' => 'ACL_F_LIST', 'cat' => 'actions'),
+		'f_read'		=> array('lang' => 'ACL_F_READ', 'cat' => 'actions'),	
+		'f_search'		=> array('lang' => 'ACL_F_SEARCH', 'cat' => 'actions'),
+		'f_subscribe'	=> array('lang' => 'ACL_F_SUBSCRIBE', 'cat' => 'actions'),
+		'f_print'		=> array('lang' => 'ACL_F_PRINT', 'cat' => 'actions'),	
+		'f_email'		=> array('lang' => 'ACL_F_EMAIL', 'cat' => 'actions'),	
+		'f_bump'		=> array('lang' => 'ACL_F_BUMP', 'cat' => 'actions'),
+		'f_user_lock'	=> array('lang' => 'ACL_F_USER_LOCK', 'cat' => 'actions'),
+		'f_download'	=> array('lang' => 'ACL_F_DOWNLOAD', 'cat' => 'actions'),	
+		'f_report'		=> array('lang' => 'ACL_F_REPORT', 'cat' => 'actions'),
+
+		'f_post'		=> array('lang' => 'ACL_F_POST', 'cat' => 'post'),
+		'f_sticky'		=> array('lang' => 'ACL_F_STICKY', 'cat' => 'post'),
+		'f_announce'	=> array('lang' => 'ACL_F_ANNOUNCE', 'cat' => 'post'),
+		'f_reply'		=> array('lang' => 'ACL_F_REPLY', 'cat' => 'post'),
+		'f_edit'		=> array('lang' => 'ACL_F_EDIT', 'cat' => 'post'),
+		'f_delete'		=> array('lang' => 'ACL_F_DELETE', 'cat' => 'post'),
+		'f_ignoreflood' => array('lang' => 'ACL_F_IGNOREFLOOD', 'cat' => 'post'),
+		'f_postcount'	=> array('lang' => 'ACL_F_POSTCOUNT', 'cat' => 'post'),
+		'f_noapprove'	=> array('lang' => 'ACL_F_NOAPPROVE', 'cat' => 'post'),	
+
+		'f_attach'		=> array('lang' => 'ACL_F_ATTACH', 'cat' => 'content'),	
+		'f_icons'		=> array('lang' => 'ACL_F_ICONS', 'cat' => 'content'),
+		'f_bbcode'		=> array('lang' => 'ACL_F_BBCODE', 'cat' => 'content'),	
+		'f_flash'		=> array('lang' => 'ACL_F_FLASH', 'cat' => 'content'),
+		'f_img'			=> array('lang' => 'ACL_F_IMG', 'cat' => 'content'),
+		'f_sigs'		=> array('lang' => 'ACL_F_SIGS', 'cat' => 'content'),
+		'f_smilies'		=> array('lang' => 'ACL_F_SMILIES', 'cat' => 'content'),
+
+		'f_poll'		=> array('lang' => 'ACL_F_POLL', 'cat' => 'polls'),
+		'f_vote'		=> array('lang' => 'ACL_F_VOTE', 'cat' => 'polls'),
+		'f_votechg'		=> array('lang' => 'ACL_F_VOTECHG', 'cat' => 'polls'),
+
+		// Moderator Permissions
+		'm_edit'		=> array('lang' => 'ACL_M_EDIT', 'cat' => 'post_actions'),
+		'm_delete'		=> array('lang' => 'ACL_M_DELETE', 'cat' => 'post_actions'),
+		'm_approve'		=> array('lang' => 'ACL_M_APPROVE', 'cat' => 'post_actions'),
+		'm_report'		=> array('lang' => 'ACL_M_REPORT', 'cat' => 'post_actions'),
+		'm_chgposter'	=> array('lang' => 'ACL_M_CHGPOSTER', 'cat' => 'post_actions'),
+
+		'm_move'	=> array('lang' => 'ACL_M_MOVE', 'cat' => 'topic_actions'),
+		'm_lock'	=> array('lang' => 'ACL_M_LOCK', 'cat' => 'topic_actions'),
+		'm_split'	=> array('lang' => 'ACL_M_SPLIT', 'cat' => 'topic_actions'),
+		'm_merge'	=> array('lang' => 'ACL_M_MERGE', 'cat' => 'topic_actions'),
+
+		'm_info'	=> array('lang' => 'ACL_M_INFO', 'cat' => 'misc'),
+		'm_warn'	=> array('lang' => 'ACL_M_WARN', 'cat' => 'misc'),
+		'm_ban'		=> array('lang' => 'ACL_M_BAN', 'cat' => 'misc'),
+
+		// Admin Permissions
+		'a_board'		=> array('lang' => 'ACL_A_BOARD', 'cat' => 'settings'),
+		'a_server'		=> array('lang' => 'ACL_A_SERVER', 'cat' => 'settings'),
+		'a_jabber'		=> array('lang' => 'ACL_A_JABBER', 'cat' => 'settings'),
+		'a_phpinfo'		=> array('lang' => 'ACL_A_PHPINFO', 'cat' => 'settings'),
+
+		'a_forum'		=> array('lang' => 'ACL_A_FORUM', 'cat' => 'forums'),
+		'a_forumadd'	=> array('lang' => 'ACL_A_FORUMADD', 'cat' => 'forums'),
+		'a_forumdel'	=> array('lang' => 'ACL_A_FORUMDEL', 'cat' => 'forums'),
+		'a_prune'		=> array('lang' => 'ACL_A_PRUNE', 'cat' => 'forums'),
+
+		'a_icons'		=> array('lang' => 'ACL_A_ICONS', 'cat' => 'posting'),
+		'a_words'		=> array('lang' => 'ACL_A_WORDS', 'cat' => 'posting'),
+		'a_bbcode'		=> array('lang' => 'ACL_A_BBCODE', 'cat' => 'posting'),
+		'a_attach'		=> array('lang' => 'ACL_A_ATTACH', 'cat' => 'posting'),
+
+		'a_user'		=> array('lang' => 'ACL_A_USER', 'cat' => 'user_group'),
+		'a_userdel'		=> array('lang' => 'ACL_A_USERDEL', 'cat' => 'user_group'),
+		'a_group'		=> array('lang' => 'ACL_A_GROUP', 'cat' => 'user_group'),
+		'a_groupadd'	=> array('lang' => 'ACL_A_GROUPADD', 'cat' => 'user_group'),
+		'a_groupdel'	=> array('lang' => 'ACL_A_GROUPDEL', 'cat' => 'user_group'),
+		'a_ranks'		=> array('lang' => 'ACL_A_RANKS', 'cat' => 'user_group'),
+		'a_profile'		=> array('lang' => 'ACL_A_PROFILE', 'cat' => 'user_group'),
+		'a_names'		=> array('lang' => 'ACL_A_NAMES', 'cat' => 'user_group'),
+		'a_ban'			=> array('lang' => 'ACL_A_BAN', 'cat' => 'user_group'),
+
+		'a_viewauth'	=> array('lang' => 'ACL_A_VIEWAUTH', 'cat' => 'permissions'),
+		'a_authgroups'	=> array('lang' => 'ACL_A_AUTHGROUPS', 'cat' => 'permissions'),
+		'a_authusers'	=> array('lang' => 'ACL_A_AUTHUSERS', 'cat' => 'permissions'),
+		'a_fauth'		=> array('lang' => 'ACL_A_FAUTH', 'cat' => 'permissions'),
+		'a_mauth'		=> array('lang' => 'ACL_A_MAUTH', 'cat' => 'permissions'),
+		'a_aauth'		=> array('lang' => 'ACL_A_AAUTH', 'cat' => 'permissions'),
+		'a_uauth'		=> array('lang' => 'ACL_A_UAUTH', 'cat' => 'permissions'),
+		'a_roles'		=> array('lang' => 'ACL_A_ROLES', 'cat' => 'permissions'),
+		'a_switchperm'	=> array('lang' => 'ACL_A_SWITCHPERM', 'cat' => 'permissions'),
+
+		'a_styles'		=> array('lang' => 'ACL_A_STYLES', 'cat' => 'misc'),
+		'a_extensions'	=> array('lang' => 'ACL_A_EXTENSIONS', 'cat' => 'misc'),
+		'a_viewlogs'	=> array('lang' => 'ACL_A_VIEWLOGS', 'cat' => 'misc'),
+		'a_clearlogs'	=> array('lang' => 'ACL_A_CLEARLOGS', 'cat' => 'misc'),
+		'a_modules'		=> array('lang' => 'ACL_A_MODULES', 'cat' => 'misc'),
+		'a_language'	=> array('lang' => 'ACL_A_LANGUAGE', 'cat' => 'misc'),
+		'a_email'		=> array('lang' => 'ACL_A_EMAIL', 'cat' => 'misc'),
+		'a_bots'		=> array('lang' => 'ACL_A_BOTS', 'cat' => 'misc'),
+		'a_reasons'		=> array('lang' => 'ACL_A_REASONS', 'cat' => 'misc'),
+		'a_backup'		=> array('lang' => 'ACL_A_BACKUP', 'cat' => 'misc'),
+		'a_search'		=> array('lang' => 'ACL_A_SEARCH', 'cat' => 'misc'),
+	);
+}
-- 
cgit v1.2.1


From e4a5ce307d49c215b08e35a79147ba2418f133ff Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sun, 14 Jul 2013 12:55:03 -0400
Subject: [ticket/11582] Test the event and and fix it.

PHPBB3-11582
---
 phpBB/phpbb/permissions.php                                           | 2 +-
 tests/functional/extension_permission_lang_test.php                   | 2 +-
 tests/functional/fixtures/ext/foo/bar/event/permission_listener.php   | 2 +-
 tests/functional/fixtures/ext/foo/bar/language/en/permissions_foo.php | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/phpBB/phpbb/permissions.php b/phpBB/phpbb/permissions.php
index 66360424ea..0fbacdad8a 100644
--- a/phpBB/phpbb/permissions.php
+++ b/phpBB/phpbb/permissions.php
@@ -66,7 +66,7 @@ class phpbb_permissions
 		* @since 3.1-A1
 		*/
 		$vars = array('types', 'categories', 'permissions');
-		extract($phpbb_dispatcher->trigger_event('core.permissions', $vars));
+		extract($phpbb_dispatcher->trigger_event('core.permissions', compact($vars)));
 
 		$this->categories = $categories;
 		$this->types = $types;
diff --git a/tests/functional/extension_permission_lang_test.php b/tests/functional/extension_permission_lang_test.php
index 6c1720735c..badbdbb057 100644
--- a/tests/functional/extension_permission_lang_test.php
+++ b/tests/functional/extension_permission_lang_test.php
@@ -75,6 +75,6 @@ class phpbb_functional_extension_permission_lang_test extends phpbb_functional_t
 		$this->assertContains('Can attach files', $crawler->filter('body')->text());
 
 		// language from ext/foo/bar/language/en/permissions_foo.php
-		$this->assertContains('Can view foo', $crawler->filter('body')->text());
+		$this->assertContains('Can view foobar', $crawler->filter('body')->text());
 	}
 }
diff --git a/tests/functional/fixtures/ext/foo/bar/event/permission_listener.php b/tests/functional/fixtures/ext/foo/bar/event/permission_listener.php
index dfabf7c540..39cb9f8b46 100644
--- a/tests/functional/fixtures/ext/foo/bar/event/permission_listener.php
+++ b/tests/functional/fixtures/ext/foo/bar/event/permission_listener.php
@@ -34,7 +34,7 @@ class phpbb_ext_foo_bar_event_permission_listener implements EventSubscriberInte
 	public function add_permissions($event)
 	{
 		$permissions = $event['permissions'];
-		$permissions['u_foo'] = array('lang' => 'ACL_U_FOO', 'cat' => 'misc'),
+		$permissions['u_foo'] = array('lang' => 'ACL_U_FOOBAR', 'cat' => 'post'),
 		$event['permissions'] = $permissions;
 	}
 }
diff --git a/tests/functional/fixtures/ext/foo/bar/language/en/permissions_foo.php b/tests/functional/fixtures/ext/foo/bar/language/en/permissions_foo.php
index 36c84c5209..64b497c394 100644
--- a/tests/functional/fixtures/ext/foo/bar/language/en/permissions_foo.php
+++ b/tests/functional/fixtures/ext/foo/bar/language/en/permissions_foo.php
@@ -1,5 +1,5 @@
 <?php
 
 $lang = array_merge($lang, array(
-	'ACL_U_FOO'		=> 'Can view foo',
+	'ACL_U_FOOBAR'		=> 'Can view foobar with permission foo',
 ));
-- 
cgit v1.2.1


From a9a6305d939467dd7e3a003a4c52f408c93f8c8c Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sun, 14 Jul 2013 13:20:58 -0400
Subject: [ticket/11582] Fix little typo

PHPBB3-11582
---
 tests/functional/fixtures/ext/foo/bar/event/permission_listener.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/functional/fixtures/ext/foo/bar/event/permission_listener.php b/tests/functional/fixtures/ext/foo/bar/event/permission_listener.php
index 39cb9f8b46..6986755f71 100644
--- a/tests/functional/fixtures/ext/foo/bar/event/permission_listener.php
+++ b/tests/functional/fixtures/ext/foo/bar/event/permission_listener.php
@@ -34,7 +34,7 @@ class phpbb_ext_foo_bar_event_permission_listener implements EventSubscriberInte
 	public function add_permissions($event)
 	{
 		$permissions = $event['permissions'];
-		$permissions['u_foo'] = array('lang' => 'ACL_U_FOOBAR', 'cat' => 'post'),
+		$permissions['u_foo'] = array('lang' => 'ACL_U_FOOBAR', 'cat' => 'post');
 		$event['permissions'] = $permissions;
 	}
 }
-- 
cgit v1.2.1


From a0e5f833113221493540376b9b73718f7a517595 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 14 Jul 2013 15:13:09 -0400
Subject: [ticket/11706] Use @ to suppress errors for getimagesize in remote
 avatar

PHPBB3-11706
---
 phpBB/phpbb/avatar/driver/remote.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/phpbb/avatar/driver/remote.php b/phpBB/phpbb/avatar/driver/remote.php
index 7da58107a1..d629a490fd 100644
--- a/phpBB/phpbb/avatar/driver/remote.php
+++ b/phpBB/phpbb/avatar/driver/remote.php
@@ -93,7 +93,7 @@ class phpbb_avatar_driver_remote extends phpbb_avatar_driver
 		// Make sure getimagesize works...
 		if (function_exists('getimagesize'))
 		{
-			if (($width <= 0 || $height <= 0) && (($image_data = getimagesize($url)) === false))
+			if (($width <= 0 || $height <= 0) && (($image_data = @getimagesize($url)) === false))
 			{
 				$error[] = 'UNABLE_GET_IMAGE_SIZE';
 				return false;
-- 
cgit v1.2.1


From 0759b606c25a6ae38ab4c7eb35ebcc2b01e3f5eb Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Tue, 16 Jul 2013 20:11:28 +0300
Subject: [ticket/11708] Fix bulletin points in notifications

PHPBB3-11708
---
 phpBB/styles/prosilver/theme/common.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index e58386de45..a2b8034187 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -758,6 +758,10 @@ p.rules a {
 	clear: both;
 }
 
+#notification_list ul li:before, #notification_list ul li:after {
+	display: none;
+}
+
 #notification_list > .header {
 	padding: 0 10px;
 	font-family: Arial, "Helvetica Neue", Helvetica, Arial, sans-serif;
-- 
cgit v1.2.1


From 792c730f15ef61d444dcdbcee91831ec89366a88 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Tue, 16 Jul 2013 20:11:58 +0200
Subject: [ticket/10931] Add phpbb_php_ini as a service.

PHPBB3-10931
---
 phpBB/config/services.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml
index c1579cfb57..6d30a154e2 100644
--- a/phpBB/config/services.yml
+++ b/phpBB/config/services.yml
@@ -239,6 +239,9 @@ services:
             - %tables.notifications%
             - %tables.user_notifications%
 
+    php_ini:
+        class: phpbb_php_ini
+
     request:
         class: phpbb_request
 
-- 
cgit v1.2.1


From fc6bed28566590c26fab5845a6b94cf9b795e4da Mon Sep 17 00:00:00 2001
From: Bruno Ais <brunoaiss@gmail.com>
Date: Tue, 16 Jul 2013 20:25:08 +0100
Subject: [ticket/11640] generate_text_for_display on functions_privmsgs.php

sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11640
---
 phpBB/includes/functions_privmsgs.php | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index 14278a2529..001cf7bba0 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -2018,14 +2018,12 @@ function message_history($msg_id, $user_id, $message_row, $folder, $in_post_mode
 
 			$decoded_message = bbcode_nl2br($decoded_message);
 		}
-
-		if ($row['bbcode_bitfield'])
-		{
-			$bbcode->bbcode_second_pass($message, $row['bbcode_uid'], $row['bbcode_bitfield']);
-		}
-
-		$message = bbcode_nl2br($message);
-		$message = smiley_text($message, !$row['enable_smilies']);
+		
+		$parse_flags = ($row['bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0);
+		$parse_flags |= ($row['enable_smilies'] ? OPTION_FLAG_SMILIES : 0);
+		
+		$message = generate_text_for_display($message, $row['bbcode_uid'], $row['bbcode_bitfield'], $parse_flags , false);
+		unset($parse_flags);
 
 		$subject = censor_text($subject);
 
-- 
cgit v1.2.1


From d6a747fbd0f80e9f2c93f09aab6a0a89ec5afd26 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 17 Jul 2013 17:27:15 +0200
Subject: [ticket/11582] Correctly add all required fixtures

PHPBB3-11582
---
 tests/functional/extension_permission_lang_test.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/functional/extension_permission_lang_test.php b/tests/functional/extension_permission_lang_test.php
index badbdbb057..19adb89819 100644
--- a/tests/functional/extension_permission_lang_test.php
+++ b/tests/functional/extension_permission_lang_test.php
@@ -18,6 +18,7 @@ class phpbb_functional_extension_permission_lang_test extends phpbb_functional_t
 
 	static protected $fixtures = array(
 		'foo/bar/language/en/',
+		'foo/bar/event/',
 	);
 
 	static public function setUpBeforeClass()
-- 
cgit v1.2.1


From 96989e536dd5fc603f3598fa7a2a50414331d76c Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Wed, 17 Jul 2013 23:55:20 +0200
Subject: [ticket/11531] Use abstract class for avatar tests and unify test
 cases

PHPBB3-11531
---
 tests/functional/avatar_acp_groups_test.php | 152 +++++++++++++++++
 tests/functional/avatar_acp_test.php        | 139 ----------------
 tests/functional/avatar_acp_users_test.php  | 152 +++++++++++++++++
 tests/functional/avatar_test.php            | 246 ----------------------------
 tests/functional/avatar_ucp_groups_test.php | 151 +++++++++++++++++
 tests/functional/avatar_ucp_users_test.php  | 151 +++++++++++++++++
 tests/functional/common_avatar_test.php     |  80 +++++++++
 7 files changed, 686 insertions(+), 385 deletions(-)
 create mode 100644 tests/functional/avatar_acp_groups_test.php
 delete mode 100644 tests/functional/avatar_acp_test.php
 create mode 100644 tests/functional/avatar_acp_users_test.php
 delete mode 100644 tests/functional/avatar_test.php
 create mode 100644 tests/functional/avatar_ucp_groups_test.php
 create mode 100644 tests/functional/avatar_ucp_users_test.php
 create mode 100644 tests/functional/common_avatar_test.php

diff --git a/tests/functional/avatar_acp_groups_test.php b/tests/functional/avatar_acp_groups_test.php
new file mode 100644
index 0000000000..62b7409bdb
--- /dev/null
+++ b/tests/functional/avatar_acp_groups_test.php
@@ -0,0 +1,152 @@
+<?php
+/**
+ *
+ * @package testing
+ * @copyright (c) 2013 phpBB Group
+ * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+ *
+ */
+
+require_once dirname(__FILE__) . '/common_avatar_test.php';
+
+/**
+ * @group functional
+ */
+class phpbb_functional_avatar_acp_groups_test extends phpbb_functional_common_avatar_test
+{
+	public function get_url()
+	{
+		return 'adm/index.php?i=acp_groups&mode=manage&action=edit&g=5';
+	}
+
+	public function avatar_acp_groups_data()
+	{
+		return array(
+			// Correct Gravatar
+			array(
+				'GROUP_UPDATED',
+				'avatar_driver_gravatar',
+				array(
+					'avatar_gravatar_email'		=> 'test@example.com',
+					'avatar_gravatar_width'		=> 80,
+					'avatar_gravatar_height'	=> 80,
+				),
+			),
+			// Gravatar with incorrect size
+			array(
+				'The submitted avatar is 120 wide and 120 high. Avatars must be at least 20 wide and 20 high, but no larger than 90 wide and 90 high.',
+				'avatar_driver_gravatar',
+				array(
+					'avatar_gravatar_email'		=> 'test@example.com',
+					'avatar_gravatar_width'		=> 120,
+					'avatar_gravatar_height'	=> 120,
+				),
+			),
+			// Incorrect email supplied for gravatar
+			array(
+				'EMAIL_INVALID_EMAIL',
+				'avatar_driver_gravatar',
+				array(
+					'avatar_gravatar_email'		=> 'test.example.com',
+					'avatar_gravatar_width'		=> 80,
+					'avatar_gravatar_height'	=> 80,
+				),
+			),
+			// Upload image from remote
+			array(
+				'GROUP_UPDATED',
+				'avatar_driver_upload',
+				array(
+					'avatar_upload_url'	=> 'https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
+				),
+			),
+			// Incorrect URL
+			array(
+				'AVATAR_URL_INVALID',
+				'avatar_driver_upload',
+				array(
+					'avatar_upload_url'	=> 'https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0?s=80',
+				),
+			),
+			/*
+			// Does not work due to DomCrawler issue
+			// Valid file upload
+			array(
+				'GROUP_UPDATED',
+				'avatar_driver_upload',
+				array(
+					'avatar_upload_file'	=> array('upload', $this->path . 'valid.jpg'),
+				),
+			),
+			*/
+			// Correct remote avatar
+			array(
+				'GROUP_UPDATED',
+				'avatar_driver_remote',
+				array(
+					'avatar_remote_url'	=> 'https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
+					'avatar_remote_width'	=> 80,
+					'avatar_remote_height'	=> 80,
+				),
+			),
+			// Remote avatar with incorrect size
+			array(
+				'The submitted avatar is 120 wide and 120 high. Avatars must be at least 20 wide and 20 high, but no larger than 90 wide and 90 high.',
+				'avatar_driver_remote',
+				array(
+					'avatar_remote_url'	=> 'https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
+					'avatar_remote_width'	=> 120,
+					'avatar_remote_height'	=> 120,
+				),
+			),
+			// Wrong driver selected
+			array(
+				'NO_AVATAR_SELECTED',
+				'avatar_driver_upload',
+				array(
+					'avatar_remote_url'	=> 'https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
+					'avatar_remote_width'	=> 80,
+					'avatar_remote_height'	=> 80,
+				),
+			),
+			// File does not exist, remote avatar currently does
+			// not check if file exists if size is specified
+			array(
+				'GROUP_UPDATED',
+				'avatar_driver_remote',
+				array(
+					'avatar_remote_url'	=> 'https://www.phpbb.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
+					'avatar_remote_width'	=> 80,
+					'avatar_remote_height'	=> 80,
+				),
+			),
+			// File does not exist and remote avatar errors when
+			// trying to get the image size
+			array(
+				'UNABLE_GET_IMAGE_SIZE',
+				'avatar_driver_remote',
+				array(
+					'avatar_remote_url'	=> 'https://www.phpbb.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
+					'avatar_remote_width'	=> '',
+					'avatar_remote_height'	=> '',
+				),
+			),
+			// Delete avatar image to reset group settings
+			array(
+				'GROUP_UPDATED',
+				'avatar_driver_gravatar',
+				array(
+					'avatar_delete'	=> array('tick', ''),
+				),
+			),
+		);
+	}
+
+	/**
+	* @dataProvider avatar_acp_groups_data
+	*/
+	public function test_avatar_acp_groups($expected, $avatar_type, $data)
+	{
+		$this->assert_avatar_submit($expected, $avatar_type, $data);
+	}
+}
diff --git a/tests/functional/avatar_acp_test.php b/tests/functional/avatar_acp_test.php
deleted file mode 100644
index 609ccbb477..0000000000
--- a/tests/functional/avatar_acp_test.php
+++ /dev/null
@@ -1,139 +0,0 @@
-<?php
-/**
- *
- * @package testing
- * @copyright (c) 2013 phpBB Group
- * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
- *
- */
-
-/**
- * @group functional
- */
-class phpbb_functional_avatar_acp_test extends phpbb_functional_test_case
-{
-	private $path;
-	private $form_content;
-
-	public function setUp()
-	{
-		parent::setUp();
-		$this->path = __DIR__ . '/fixtures/files/';
-		$this->login();
-		$this->admin_login();
-		$this->add_lang(array('acp/board', 'ucp', 'acp/users', 'acp/groups'));
-	}
-
-	public function test_acp_settings()
-	{
-		$crawler = $this->request('GET', 'adm/index.php?i=acp_board&mode=avatar&sid=' . $this->sid);
-		// Check the default entries we should have
-		$this->assertContainsLang('ALLOW_GRAVATAR', $crawler->text());
-		$this->assertContainsLang('ALLOW_REMOTE', $crawler->text());
-		$this->assertContainsLang('ALLOW_AVATARS', $crawler->text());
-		$this->assertContainsLang('ALLOW_LOCAL', $crawler->text());
-
-		// Now start setting the needed settings
-		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
-		$form['config[allow_avatar_local]']->select(1);
-		$form['config[allow_avatar_gravatar]']->select(1);
-		$form['config[allow_avatar_remote]']->select(1);
-		$form['config[allow_avatar_remote_upload]']->select(1);
-		$crawler = self::submit($form);
-		$this->assertContainsLang('CONFIG_UPDATED', $crawler->text());
-	}
-
-	public function test_user_acp_settings()
-	{
-		$crawler = $this->request('GET', 'adm/index.php?i=users&u=2&sid=' . $this->sid);
-
-		// Select "Avatar" in the drop-down menu
-		$form = $crawler->selectButton($this->lang('GO'))->form();
-		$form['mode']->select('avatar');
-		$crawler = self::submit($form);
-		$this->assertContainsLang('AVATAR_TYPE', $crawler->text());
-
-		// Test if setting a gravatar avatar properly works
-		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
-		$form['avatar_driver']->select('avatar_driver_gravatar');
-		$form['avatar_gravatar_email']->setValue('test@example.com');
-		$form['avatar_gravatar_width']->setValue(80);
-		$form['avatar_gravatar_height']->setValue(80);
-		$crawler = self::submit($form);
-		$this->assertContainsLang('USER_AVATAR_UPDATED', $crawler->text());
-
-		// Go back to previous page
-		$crawler = $this->request('GET', 'adm/index.php?i=users&u=2&sid=' . $this->sid);
-
-		// Select "Avatar" in the drop-down menu
-		$form = $crawler->selectButton($this->lang('GO'))->form();
-		$form['mode']->select('avatar');
-		$crawler = self::submit($form);
-		$this->assertContainsLang('AVATAR_TYPE', $crawler->text());
-
-		// Test uploading a remote avatar
-		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
-		$form['avatar_driver']->select('avatar_driver_upload');
-		// use default gravatar supplied by test@example.com and default size = 80px
-		$form['avatar_upload_url']->setValue('https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg');
-		$crawler = self::submit($form);
-		$this->assertContainsLang('USER_AVATAR_UPDATED', $crawler->text());
-
-		// Go back to previous page
-		$crawler = $this->request('GET', 'adm/index.php?i=users&u=2&sid=' . $this->sid);
-
-		// Select "Avatar" in the drop-down menu
-		$form = $crawler->selectButton($this->lang('GO'))->form();
-		$form['mode']->select('avatar');
-		$crawler = self::submit($form);
-		$this->assertContainsLang('AVATAR_TYPE', $crawler->text());
-
-		// Submit gravatar with incorrect email and correct size
-		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
-		$form['avatar_driver']->select('avatar_driver_gravatar');
-		$form['avatar_gravatar_email']->setValue('test.example.com');
-		$form['avatar_gravatar_width']->setValue(80);
-		$form['avatar_gravatar_height']->setValue(80);
-		$crawler = self::submit($form);
-		$this->assertContainsLang('EMAIL_INVALID_EMAIL', $crawler->text());
-	}
-
-	public function test_group_acp_settings()
-	{
-		// Test setting group avatar of admin group
-		$crawler = $this->request('GET', 'adm/index.php?i=acp_groups&mode=manage&action=edit&g=5&sid=' . $this->sid);
-		$this->assertContainsLang('AVATAR_TYPE', $crawler->text());
-
-		// Test if setting a gravatar avatar properly works
-		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
-		$form['avatar_driver']->select('avatar_driver_gravatar');
-		$form['avatar_gravatar_email']->setValue('test@example.com');
-		$form['avatar_gravatar_width']->setValue(80);
-		$form['avatar_gravatar_height']->setValue(80);
-		$crawler = self::submit($form);
-		$this->assertContainsLang('GROUP_UPDATED', $crawler->text());
-
-		// Go back to previous page
-		$crawler = $this->request('GET', 'adm/index.php?i=acp_groups&mode=manage&action=edit&g=5&sid=' . $this->sid);
-
-		// Test uploading a remote avatar
-		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
-		$form['avatar_driver']->select('avatar_driver_upload');
-		// use default gravatar supplied by test@example.com and default size = 80px
-		$form['avatar_upload_url']->setValue('https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg');
-		$crawler = self::submit($form);
-		$this->assertContainsLang('GROUP_UPDATED', $crawler->text());
-
-		// Go back to previous page
-		$crawler = $this->request('GET', 'adm/index.php?i=acp_groups&mode=manage&action=edit&g=5&sid=' . $this->sid);
-
-		// Submit gravatar with incorrect email and correct size
-		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
-		$form['avatar_driver']->select('avatar_driver_gravatar');
-		$form['avatar_gravatar_email']->setValue('test.example.com');
-		$form['avatar_gravatar_width']->setValue(80);
-		$form['avatar_gravatar_height']->setValue(80);
-		$crawler = self::submit($form);
-		$this->assertContainsLang('EMAIL_INVALID_EMAIL', $crawler->text());
-	}
-}
diff --git a/tests/functional/avatar_acp_users_test.php b/tests/functional/avatar_acp_users_test.php
new file mode 100644
index 0000000000..38ebcc8940
--- /dev/null
+++ b/tests/functional/avatar_acp_users_test.php
@@ -0,0 +1,152 @@
+<?php
+/**
+ *
+ * @package testing
+ * @copyright (c) 2013 phpBB Group
+ * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+ *
+ */
+
+require_once dirname(__FILE__) . '/common_avatar_test.php';
+
+/**
+ * @group functional
+ */
+class phpbb_functional_avatar_acp_users_test extends phpbb_functional_common_avatar_test
+{
+	public function get_url()
+	{
+		return 'adm/index.php?i=acp_users&u=2&mode=avatar';
+	}
+
+	public function avatar_acp_users_data()
+	{
+		return array(
+			// Correct gravatar
+			array(
+				'USER_AVATAR_UPDATED',
+				'avatar_driver_gravatar',
+				array(
+					'avatar_gravatar_email'		=> 'test@example.com',
+					'avatar_gravatar_width'		=> 80,
+					'avatar_gravatar_height'	=> 80,
+				),
+			),
+			// Gravatar with incorrect sizes
+			array(
+				'The submitted avatar is 120 wide and 120 high. Avatars must be at least 20 wide and 20 high, but no larger than 90 wide and 90 high.',
+				'avatar_driver_gravatar',
+				array(
+					'avatar_gravatar_email'		=> 'test@example.com',
+					'avatar_gravatar_width'		=> 120,
+					'avatar_gravatar_height'	=> 120,
+				),
+			),
+			// Gravatar with incorrect email
+			array(
+				'EMAIL_INVALID_EMAIL',
+				'avatar_driver_gravatar',
+				array(
+					'avatar_gravatar_email'		=> 'test.example.com',
+					'avatar_gravatar_width'		=> 80,
+					'avatar_gravatar_height'	=> 80,
+				),
+			),
+			// Remote avatar with correct link
+			array(
+				'USER_AVATAR_UPDATED',
+				'avatar_driver_upload',
+				array(
+					'avatar_upload_url'	=> 'https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
+				),
+			),
+			// Incorrect URL
+			array(
+				'AVATAR_URL_INVALID',
+				'avatar_driver_upload',
+				array(
+					'avatar_upload_url'	=> 'https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0?s=80',
+				),
+			),
+			/*
+			// Does not work due to DomCrawler issue
+			// Valid file upload
+			array(
+				'PROFILE_UPDATED',
+				'avatar_driver_upload',
+				array(
+					'avatar_upload_file'	=> array('upload', $this->path . 'valid.jpg'),
+				),
+			),
+			*/
+			// Correct remote avatar
+			array(
+				'USER_AVATAR_UPDATED',
+				'avatar_driver_remote',
+				array(
+					'avatar_remote_url'	=> 'https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
+					'avatar_remote_width'	=> 80,
+					'avatar_remote_height'	=> 80,
+				),
+			),
+			// Remote avatar with incorrect size
+			array(
+				'The submitted avatar is 120 wide and 120 high. Avatars must be at least 20 wide and 20 high, but no larger than 90 wide and 90 high.',
+				'avatar_driver_remote',
+				array(
+					'avatar_remote_url'	=> 'https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
+					'avatar_remote_width'	=> 120,
+					'avatar_remote_height'	=> 120,
+				),
+			),
+			// Wrong driver selected
+			array(
+				'NO_AVATAR_SELECTED',
+				'avatar_driver_upload',
+				array(
+					'avatar_remote_url'	=> 'https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
+					'avatar_remote_width'	=> 80,
+					'avatar_remote_height'	=> 80,
+				),
+			),
+			// File does not exist, remote avatar currently does
+			// not check if file exists if size is specified
+			array(
+				'USER_AVATAR_UPDATED',
+				'avatar_driver_remote',
+				array(
+					'avatar_remote_url'	=> 'https://www.phpbb.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
+					'avatar_remote_width'	=> 80,
+					'avatar_remote_height'	=> 80,
+				),
+			),
+			// File does not exist and remote avatar errors when
+			// trying to get the image size
+			array(
+				'UNABLE_GET_IMAGE_SIZE',
+				'avatar_driver_remote',
+				array(
+					'avatar_remote_url'	=> 'https://www.phpbb.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
+					'avatar_remote_width'	=> '',
+					'avatar_remote_height'	=> '',
+				),
+			),
+			// Reset avatar settings
+			array(
+				'USER_AVATAR_UPDATED',
+				'avatar_driver_gravatar',
+				array(
+					'avatar_delete'	=> array('tick', ''),
+				),
+			),
+		);
+	}
+
+	/**
+	* @dataProvider avatar_acp_users_data
+	*/
+	public function test_avatar_acp_users($expected, $avatar_type, $data)
+	{
+		$this->assert_avatar_submit($expected, $avatar_type, $data);
+	}
+}
diff --git a/tests/functional/avatar_test.php b/tests/functional/avatar_test.php
deleted file mode 100644
index c96ed46d30..0000000000
--- a/tests/functional/avatar_test.php
+++ /dev/null
@@ -1,246 +0,0 @@
-<?php
-/**
- *
- * @package testing
- * @copyright (c) 2013 phpBB Group
- * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
- *
- */
-
-/**
- * @group functional
- */
-class phpbb_functional_avatar_test extends phpbb_functional_test_case
-{
-	private $path;
-	private $form_content;
-
-	public function setUp()
-	{
-		parent::setUp();
-		$this->path = __DIR__ . '/fixtures/files/';
-		$this->login();
-		$this->admin_login();
-		$this->add_lang(array('acp/board', 'ucp', 'acp/groups'));
-	}
-
-	public function test_acp_settings()
-	{
-		$crawler = $this->request('GET', 'adm/index.php?i=acp_board&mode=avatar&sid=' . $this->sid);
-		// Check the default entries we should have
-		$this->assertContainsLang('ALLOW_GRAVATAR', $crawler->text());
-		$this->assertContainsLang('ALLOW_REMOTE', $crawler->text());
-		$this->assertContainsLang('ALLOW_AVATARS', $crawler->text());
-		$this->assertContainsLang('ALLOW_LOCAL', $crawler->text());
-
-		// Now start setting the needed settings
-		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
-		$form['config[allow_avatar_local]']->select(1);
-		$form['config[allow_avatar_gravatar]']->select(1);
-		$form['config[allow_avatar_remote]']->select(1);
-		$form['config[allow_avatar_remote_upload]']->select(1);
-		$crawler = self::submit($form);
-		$this->assertContainsLang('CONFIG_UPDATED', $crawler->text());
-	}
-
-	public function test_gravatar_avatar()
-	{
-		// Get ACP settings
-		$crawler = $this->request('GET', 'adm/index.php?i=acp_board&mode=avatar&sid=' . $this->sid);
-		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
-		$this->form_content = $form->getValues();
-
-		// Check if required form elements exist
-		$crawler = $this->request('GET', 'ucp.php?i=ucp_profile&mode=avatar&sid=' . $this->sid);
-		$this->assertContainsLang('AVATAR_TYPE', $crawler->text());
-		$this->assertContainsLang('AVATAR_DRIVER_GRAVATAR_TITLE', $crawler->filter('#avatar_driver')->text());
-		$this->assertContainsLang('GRAVATAR_AVATAR_EMAIL', $crawler->text());
-
-		// Submit gravatar with correct email and correct size
-		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
-		$form['avatar_driver']->select('avatar_driver_gravatar');
-		$form['avatar_gravatar_email']->setValue('test@example.com');
-		$form['avatar_gravatar_width']->setValue(80);
-		$form['avatar_gravatar_height']->setValue(80);
-		$crawler = self::submit($form);
-		$this->assertContainsLang('PROFILE_UPDATED', $crawler->text());
-
-		// Submit gravatar with correct mail but incorrect size
-		$crawler = $this->request('GET', 'ucp.php?i=ucp_profile&mode=avatar&sid=' . $this->sid);
-		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
-		$form['avatar_driver']->select('avatar_driver_gravatar');
-		$form['avatar_gravatar_email']->setValue('test@example.com');
-		$form['avatar_gravatar_width']->setValue(120);
-		$form['avatar_gravatar_height']->setValue(120);
-		$crawler = self::submit($form);
-		$this->assertContains(sprintf($this->lang['AVATAR_WRONG_SIZE'],
-			$this->form_content['config[avatar_min_width]'],
-			$this->form_content['config[avatar_min_height]'],
-			$this->form_content['config[avatar_max_width]'],
-			$this->form_content['config[avatar_max_height]'],
-			'120',
-			'120'
-		), $crawler->text());
-
-		// Submit gravatar with incorrect email and correct size
-		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
-		$form['avatar_driver']->select('avatar_driver_gravatar');
-		$form['avatar_gravatar_email']->setValue('test.example.com');
-		$form['avatar_gravatar_width']->setValue(80);
-		$form['avatar_gravatar_height']->setValue(80);
-		$crawler = self::submit($form);
-		$this->assertContainsLang('EMAIL_INVALID_EMAIL', $crawler->text());
-	}
-
-	public function test_upload_avatar()
-	{
-		// Check if required form elements exist
-		$crawler = $this->request('GET', 'ucp.php?i=ucp_profile&mode=avatar&sid=' . $this->sid);
-		$this->assertContainsLang('AVATAR_DRIVER_UPLOAD_TITLE', $crawler->filter('#avatar_driver')->text());
-		$this->assertContainsLang('UPLOAD_AVATAR_FILE', $crawler->text());
-		$this->assertContainsLang('UPLOAD_AVATAR_URL', $crawler->text());
-
-		// Upload remote avatar with correct size and correct link
-		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
-		$form['avatar_driver']->select('avatar_driver_upload');
-		// use default gravatar supplied by test@example.com and default size = 80px
-		$form['avatar_upload_url']->setValue('https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg');
-		$crawler = self::submit($form);
-		$this->assertContainsLang('PROFILE_UPDATED', $crawler->text());
-
-		// This will fail as the upload avatar currently expects a file that ends with an extension, e.g. .jpg
-		$crawler = $this->request('GET', 'ucp.php?i=ucp_profile&mode=avatar&sid=' . $this->sid);
-		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
-		$form['avatar_driver']->select('avatar_driver_upload');
-		// use default gravatar supplied by test@example.com and size (s) = 80px
-		$form['avatar_upload_url']->setValue('https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0?s=80');
-		$crawler = self::submit($form);
-		$this->assertContainsLang('AVATAR_URL_INVALID', $crawler->text());
-
-		// Submit gravatar with correct email and correct size
-		$crawler = $this->request('GET', 'ucp.php?i=ucp_profile&mode=avatar&sid=' . $this->sid);
-		$this->markTestIncomplete('Test fails due to bug in DomCrawler with Symfony < 2.2: https://github.com/symfony/symfony/issues/4674.');
-		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
-		$form['avatar_driver']->select('avatar_driver_upload');
-		$form['avatar_upload_file']->setValue($this->path . 'valid.jpg');
-		$crawler = self::submit($form);
-		$this->assertContainsLang('PROFILE_UPDATED', $crawler->text());
-	}
-
-	public function test_remote_avatar()
-	{
-		// Get ACP settings
-		$crawler = $this->request('GET', 'adm/index.php?i=acp_board&mode=avatar&sid=' . $this->sid);
-		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
-		$this->form_content = $form->getValues();
-
-		// Check if required form elements exist
-		$crawler = $this->request('GET', 'ucp.php?i=ucp_profile&mode=avatar&sid=' . $this->sid);
-		$this->assertContainsLang('AVATAR_DRIVER_REMOTE_TITLE', $crawler->filter('#avatar_driver')->text());
-		$this->assertContainsLang('LINK_REMOTE_AVATAR', $crawler->text());
-		$this->assertContainsLang('LINK_REMOTE_SIZE', $crawler->text());
-
-		// Set remote avatar with correct size and correct link
-		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
-		$form['avatar_driver']->select('avatar_driver_remote');
-		// use default gravatar supplied by test@example.com and default size = 80px
-		$form['avatar_remote_url']->setValue('https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg');
-		$form['avatar_remote_width']->setValue(80);
-		$form['avatar_remote_height']->setValue(80);
-		$crawler = self::submit($form);
-		$this->assertContainsLang('PROFILE_UPDATED', $crawler->text());
-
-		// Set remote avatar with incorrect size
-		$crawler = $this->request('GET', 'ucp.php?i=ucp_profile&mode=avatar&sid=' . $this->sid);
-		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
-		$form['avatar_driver']->select('avatar_driver_remote');
-		// use default gravatar supplied by test@example.com and size (s) = 80px
-		$form['avatar_remote_url']->setValue('https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg');
-		$form['avatar_remote_width']->setValue(120);
-		$form['avatar_remote_height']->setValue(120);
-		$crawler = self::submit($form);
-		$this->assertContains(sprintf($this->lang['AVATAR_WRONG_SIZE'],
-			$this->form_content['config[avatar_min_width]'],
-			$this->form_content['config[avatar_min_height]'],
-			$this->form_content['config[avatar_max_width]'],
-			$this->form_content['config[avatar_max_height]'],
-			'120',
-			'120'
-		), $crawler->text());
-
-		// Enter correct data in form entries but select incorrect avatar driver
-		$crawler = $this->request('GET', 'ucp.php?i=ucp_profile&mode=avatar&sid=' . $this->sid);
-		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
-		$form['avatar_driver']->select('avatar_driver_upload');
-		// use default gravatar supplied by test@example.com and size (s) = 80px
-		$form['avatar_remote_url']->setValue('https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg');
-		$form['avatar_remote_width']->setValue(80);
-		$form['avatar_remote_height']->setValue(80);
-		$crawler = self::submit($form);
-		$this->assertContainsLang('NO_AVATAR_SELECTED', $crawler->text());
-
-		/*
-		 * Enter incorrect link to a remote avatar_driver
-		 * Due to the fact that this link to phpbb.com will not serve a 404 error but rather a 404 page,
-		 * the remote avatar will think that this is a properly working avatar. This Bug also exists in
-		 * the current phpBB 3.0.11 release.
-		 */
-		$crawler = $this->request('GET', 'ucp.php?i=ucp_profile&mode=avatar&sid=' . $this->sid);
-		$this->markTestIncomplete('Test currently fails because the remote avatar does not seem to check if it is an image');
-		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
-		$form['avatar_driver']->select('avatar_driver_remote');
-		// use random incorrect link to phpBB.com
-		$form['avatar_remote_url']->setValue('https://www.phpbb.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg');
-		$form['avatar_remote_width']->setValue(80);
-		$form['avatar_remote_height']->setValue(80);
-		$crawler = self::submit($form);
-		$this->assertContainsLang('NO_AVATAR_SELECTED', $crawler->text());
-	}
-
-
-	public function test_group_ucp_settings()
-	{
-		// Test setting group avatar of admin group
-		$crawler = $this->request('GET', 'ucp.php?i=ucp_groups&mode=manage&action=edit&g=5&sid=' . $this->sid);
-		$this->assertContainsLang('AVATAR_TYPE', $crawler->text());
-
-		// Test if setting a gravatar avatar properly works
-		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
-		$form['avatar_driver']->select('avatar_driver_gravatar');
-		$form['avatar_gravatar_email']->setValue('test@example.com');
-		$form['avatar_gravatar_width']->setValue(80);
-		$form['avatar_gravatar_height']->setValue(80);
-		$crawler = self::submit($form);
-		$this->assertContainsLang('GROUP_UPDATED', $crawler->text());
-
-		// Go back to previous page
-		$crawler = $this->request('GET', 'ucp.php?i=ucp_groups&mode=manage&action=edit&g=5&sid=' . $this->sid);
-
-		// Test uploading a remote avatar
-		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
-		$form['avatar_driver']->select('avatar_driver_upload');
-		// use default gravatar supplied by test@example.com and default size = 80px
-		$form['avatar_upload_url']->setValue('https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg');
-		$crawler = self::submit($form);
-		$this->assertContainsLang('GROUP_UPDATED', $crawler->text());
-
-		// Go back to previous page
-		$crawler = $this->request('GET', 'ucp.php?i=ucp_groups&mode=manage&action=edit&g=5&sid=' . $this->sid);
-
-		// Submit gravatar with incorrect email and correct size
-		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
-		$form['avatar_driver']->select('avatar_driver_gravatar');
-		$form['avatar_gravatar_email']->setValue('test.example.com');
-		$form['avatar_gravatar_width']->setValue(80);
-		$form['avatar_gravatar_height']->setValue(80);
-		$crawler = self::submit($form);
-		$this->assertContainsLang('EMAIL_INVALID_EMAIL', $crawler->text());
-
-		// Delete avatar
-		$crawler = $this->request('GET', 'ucp.php?i=ucp_groups&mode=manage&action=edit&g=5&sid=' . $this->sid);
-		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
-		$form['avatar_delete']->tick();
-		$crawler = self::submit($form);
-		$this->assertContainsLang('GROUP_UPDATED', $crawler->text());
-	}
-}
diff --git a/tests/functional/avatar_ucp_groups_test.php b/tests/functional/avatar_ucp_groups_test.php
new file mode 100644
index 0000000000..bd34f67491
--- /dev/null
+++ b/tests/functional/avatar_ucp_groups_test.php
@@ -0,0 +1,151 @@
+<?php
+/**
+ *
+ * @package testing
+ * @copyright (c) 2013 phpBB Group
+ * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+ *
+ */
+
+require_once dirname(__FILE__) . '/common_avatar_test.php';
+
+/**
+ * @group functional
+ */
+class phpbb_functional_avatar_ucp_groups_test extends phpbb_functional_common_avatar_test
+{
+	public function get_url()
+	{
+		return 'ucp.php?i=ucp_groups&mode=manage&action=edit&g=5';
+	}
+
+	public function avatar_ucp_groups_data()
+	{
+		return array(
+			// Gravatar with correct settings
+			array(
+				'GROUP_UPDATED',
+				'avatar_driver_gravatar',
+				array(
+					'avatar_gravatar_email'		=> 'test@example.com',
+					'avatar_gravatar_width'		=> 80,
+					'avatar_gravatar_height'	=> 80,
+				),
+			),
+			// Gravatar with incorrect sizing
+			array(
+				'The submitted avatar is 120 wide and 120 high. Avatars must be at least 20 wide and 20 high, but no larger than 90 wide and 90 high.',
+				'avatar_driver_gravatar',
+				array(
+					'avatar_gravatar_email'		=> 'test@example.com',
+					'avatar_gravatar_width'		=> 120,
+					'avatar_gravatar_height'	=> 120,
+				),
+			),
+			// Gravatar with incorrect email address
+			array(
+				'EMAIL_INVALID_EMAIL',
+				'avatar_driver_gravatar',
+				array(
+					'avatar_gravatar_email'		=> 'test.example.com',
+					'avatar_gravatar_width'		=> 80,
+					'avatar_gravatar_height'	=> 80,
+				),
+			),
+			// Correct remote upload avatar
+			array(
+				'GROUP_UPDATED',
+				'avatar_driver_upload',
+				array(
+					'avatar_upload_url'	=> 'https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
+				),
+			),
+			// Incorrect URL
+			array(
+				'AVATAR_URL_INVALID',
+				'avatar_driver_upload',
+				array(
+					'avatar_upload_url'	=> 'https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0?s=80',
+				),
+			),
+			/*
+			// Does not work due to DomCrawler issue
+			// Valid file upload
+			array(
+				'GROUP_UPDATED',
+				'avatar_driver_upload',
+				array(
+					'avatar_upload_file'	=> array('upload', $this->path . 'valid.jpg'),
+				),
+			),
+			*/
+			// Correct remote avatar
+			array(
+				'GROUP_UPDATED',
+				'avatar_driver_remote',
+				array(
+					'avatar_remote_url'	=> 'https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
+					'avatar_remote_width'	=> 80,
+					'avatar_remote_height'	=> 80,
+				),
+			),
+			// Remote avatar with incorrect size
+			array(
+				'The submitted avatar is 120 wide and 120 high. Avatars must be at least 20 wide and 20 high, but no larger than 90 wide and 90 high.',
+				'avatar_driver_remote',
+				array(
+					'avatar_remote_url'	=> 'https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
+					'avatar_remote_width'	=> 120,
+					'avatar_remote_height'	=> 120,
+				),
+			),
+			// Wrong driver selected
+			array(
+				'NO_AVATAR_SELECTED',
+				'avatar_driver_upload',
+				array(
+					'avatar_remote_url'	=> 'https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
+					'avatar_remote_width'	=> 80,
+					'avatar_remote_height'	=> 80,
+				),
+			),
+			// File does not exist, remote avatar currently does
+			// not check if file exists if size is specified
+			array(
+				'GROUP_UPDATED',
+				'avatar_driver_remote',
+				array(
+					'avatar_remote_url'	=> 'https://www.phpbb.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
+					'avatar_remote_width'	=> 80,
+					'avatar_remote_height'	=> 80,
+				),
+			),
+			// File does not exist and remote avatar errors when
+			// trying to get the image size
+			array(
+				'UNABLE_GET_IMAGE_SIZE',
+				'avatar_driver_remote',
+				array(
+					'avatar_remote_url'	=> 'https://www.phpbb.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
+					'avatar_remote_width'	=> '',
+					'avatar_remote_height'	=> '',
+				),
+			),
+			array(
+				'GROUP_UPDATED',
+				'avatar_driver_gravatar',
+				array(
+					'avatar_delete'	=> array('tick', ''),
+				),
+			),
+		);
+	}
+
+	/**
+	* @dataProvider avatar_ucp_groups_data
+	*/
+	public function test_avatar_ucp_groups($expected, $avatar_type, $data)
+	{
+		$this->assert_avatar_submit($expected, $avatar_type, $data);
+	}
+}
diff --git a/tests/functional/avatar_ucp_users_test.php b/tests/functional/avatar_ucp_users_test.php
new file mode 100644
index 0000000000..6b2c2344b3
--- /dev/null
+++ b/tests/functional/avatar_ucp_users_test.php
@@ -0,0 +1,151 @@
+<?php
+/**
+ *
+ * @package testing
+ * @copyright (c) 2013 phpBB Group
+ * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+ *
+ */
+
+require_once dirname(__FILE__) . '/common_avatar_test.php';
+
+/**
+ * @group functional
+ */
+class phpbb_functional_avatar_ucp_users_test extends phpbb_functional_common_avatar_test
+{
+	public function get_url()
+	{
+		return 'ucp.php?i=ucp_profile&mode=avatar';
+	}
+
+	public function avatar_ucp_groups_data()
+	{
+		return array(
+			// Gravatar with correct settings
+			array(
+				'PROFILE_UPDATED',
+				'avatar_driver_gravatar',
+				array(
+					'avatar_gravatar_email'		=> 'test@example.com',
+					'avatar_gravatar_width'		=> 80,
+					'avatar_gravatar_height'	=> 80,
+				),
+			),
+			// Gravatar with incorrect sizing
+			array(
+				'The submitted avatar is 120 wide and 120 high. Avatars must be at least 20 wide and 20 high, but no larger than 90 wide and 90 high.',
+				'avatar_driver_gravatar',
+				array(
+					'avatar_gravatar_email'		=> 'test@example.com',
+					'avatar_gravatar_width'		=> 120,
+					'avatar_gravatar_height'	=> 120,
+				),
+			),
+			// Gravatar with incorrect email address
+			array(
+				'EMAIL_INVALID_EMAIL',
+				'avatar_driver_gravatar',
+				array(
+					'avatar_gravatar_email'		=> 'test.example.com',
+					'avatar_gravatar_width'		=> 80,
+					'avatar_gravatar_height'	=> 80,
+				),
+			),
+			// Correct remote upload avatar
+			array(
+				'PROFILE_UPDATED',
+				'avatar_driver_upload',
+				array(
+					'avatar_upload_url'	=> 'https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
+				),
+			),
+			// Incorrect URL
+			array(
+				'AVATAR_URL_INVALID',
+				'avatar_driver_upload',
+				array(
+					'avatar_upload_url'	=> 'https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0?s=80',
+				),
+			),
+			/*
+			// Does not work due to DomCrawler issue
+			// Valid file upload
+			array(
+				'PROFILE_UPDATED',
+				'avatar_driver_upload',
+				array(
+					'avatar_upload_file'	=> array('upload', $this->path . 'valid.jpg'),
+				),
+			),
+			*/
+			// Correct remote avatar
+			array(
+				'PROFILE_UPDATED',
+				'avatar_driver_remote',
+				array(
+					'avatar_remote_url'	=> 'https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
+					'avatar_remote_width'	=> 80,
+					'avatar_remote_height'	=> 80,
+				),
+			),
+			// Remote avatar with incorrect size
+			array(
+				'The submitted avatar is 120 wide and 120 high. Avatars must be at least 20 wide and 20 high, but no larger than 90 wide and 90 high.',
+				'avatar_driver_remote',
+				array(
+					'avatar_remote_url'	=> 'https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
+					'avatar_remote_width'	=> 120,
+					'avatar_remote_height'	=> 120,
+				),
+			),
+			// Wrong driver selected
+			array(
+				'NO_AVATAR_SELECTED',
+				'avatar_driver_upload',
+				array(
+					'avatar_remote_url'	=> 'https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
+					'avatar_remote_width'	=> 80,
+					'avatar_remote_height'	=> 80,
+				),
+			),
+			// File does not exist, remote avatar currently does
+			// not check if file exists if size is specified
+			array(
+				'PROFILE_UPDATED',
+				'avatar_driver_remote',
+				array(
+					'avatar_remote_url'	=> 'https://www.phpbb.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
+					'avatar_remote_width'	=> 80,
+					'avatar_remote_height'	=> 80,
+				),
+			),
+			// File does not exist and remote avatar errors when
+			// trying to get the image size
+			array(
+				'UNABLE_GET_IMAGE_SIZE',
+				'avatar_driver_remote',
+				array(
+					'avatar_remote_url'	=> 'https://www.phpbb.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
+					'avatar_remote_width'	=> '',
+					'avatar_remote_height'	=> '',
+				),
+			),
+			array(
+				'PROFILE_UPDATED',
+				'avatar_driver_gravatar',
+				array(
+					'avatar_delete'	=> array('tick', ''),
+				),
+			),
+		);
+	}
+
+	/**
+	* @dataProvider avatar_ucp_groups_data
+	*/
+	public function test_avatar_ucp_groups($expected, $avatar_type, $data)
+	{
+		$this->assert_avatar_submit($expected, $avatar_type, $data);
+	}
+}
diff --git a/tests/functional/common_avatar_test.php b/tests/functional/common_avatar_test.php
new file mode 100644
index 0000000000..c0f21d07c2
--- /dev/null
+++ b/tests/functional/common_avatar_test.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ *
+ * @package testing
+ * @copyright (c) 2013 phpBB Group
+ * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+ *
+ */
+
+/**
+ * @group functional
+ */
+abstract class phpbb_functional_common_avatar_test extends phpbb_functional_test_case
+{
+	private $path;
+	private $form_content;
+
+	abstract function get_url();
+
+	public function setUp()
+	{
+		parent::setUp();
+		$this->path = __DIR__ . '/fixtures/files/';
+		$this->login();
+		$this->admin_login();
+		$this->add_lang(array('acp/board', 'ucp', 'acp/users', 'acp/groups'));
+		$this->set_acp_settings();
+	}
+
+	private function set_acp_settings()
+	{
+		$crawler = self::request('GET', 'adm/index.php?i=acp_board&mode=avatar&sid=' . $this->sid);
+		// Check the default entries we should have
+		$this->assertContainsLang('ALLOW_GRAVATAR', $crawler->text());
+		$this->assertContainsLang('ALLOW_REMOTE', $crawler->text());
+		$this->assertContainsLang('ALLOW_AVATARS', $crawler->text());
+		$this->assertContainsLang('ALLOW_LOCAL', $crawler->text());
+
+		// Now start setting the needed settings
+		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
+		$form['config[allow_avatar_local]']->select(1);
+		$form['config[allow_avatar_gravatar]']->select(1);
+		$form['config[allow_avatar_remote]']->select(1);
+		$form['config[allow_avatar_remote_upload]']->select(1);
+		$crawler = self::submit($form);
+		$this->assertContainsLang('CONFIG_UPDATED', $crawler->text());
+	}
+
+	public function assert_avatar_submit($expected, $type, $data, $button_text = 'SUBMIT')
+	{
+		$crawler = self::request('GET', $this->get_url() . '&sid=' . $this->sid);
+
+		// Test if setting a gravatar avatar properly works
+		$form = $crawler->selectButton($this->lang($button_text))->form();
+		$form['avatar_driver']->select($type);
+
+		foreach ($data as $key => $value)
+		{
+			if (is_array($value))
+			{
+				$form[$key]->$value[0]($value[1]);
+			}
+			else
+			{
+				$form[$key]->setValue($value);
+			}
+		}
+
+		$crawler = self::submit($form);
+
+		try
+		{
+			$this->assertContainsLang($expected, $crawler->text());
+		}
+		catch (Exception $e)
+		{
+			$this->assertContains($expected, $crawler->text());
+		}
+	}
+}
-- 
cgit v1.2.1


From 16b411616575cdd4023fb42bb77b56e43db735e0 Mon Sep 17 00:00:00 2001
From: Bruno Ais <brunoaiss@gmail.com>
Date: Thu, 18 Jul 2013 16:15:36 +0100
Subject: [ticket/11654] generate_text_for_display on mcp/mcp_warn.php

sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11654
---
 phpBB/includes/mcp/mcp_warn.php | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/phpBB/includes/mcp/mcp_warn.php b/phpBB/includes/mcp/mcp_warn.php
index 4ef477775d..d0fcd8a77d 100644
--- a/phpBB/includes/mcp/mcp_warn.php
+++ b/phpBB/includes/mcp/mcp_warn.php
@@ -289,19 +289,7 @@ class mcp_warn
 
 		// We want to make the message available here as a reminder
 		// Parse the message and subject
-		$message = censor_text($user_row['post_text']);
-
-		// Second parse bbcode here
-		if ($user_row['bbcode_bitfield'])
-		{
-			include_once($phpbb_root_path . 'includes/bbcode.' . $phpEx);
-
-			$bbcode = new bbcode($user_row['bbcode_bitfield']);
-			$bbcode->bbcode_second_pass($message, $user_row['bbcode_uid'], $user_row['bbcode_bitfield']);
-		}
-
-		$message = bbcode_nl2br($message);
-		$message = smiley_text($message);
+		$message = generate_text_for_display($message, $user_row['bbcode_uid'], $user_row['bbcode_bitfield'], ($user_row['bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0) | OPTION_FLAG_SMILIES, true);
 
 		// Generate the appropriate user information for the user we are looking at
 		if (!function_exists('phpbb_get_user_avatar'))
-- 
cgit v1.2.1


From d05c04ae40326768e35464d42e3bd9e51b140155 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Thu, 18 Jul 2013 19:10:36 +0300
Subject: [ticket/11712] Fixing typo in editor.js

PHPBB3-11712
---
 phpBB/styles/prosilver/template/editor.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/styles/prosilver/template/editor.js b/phpBB/styles/prosilver/template/editor.js
index 235cc0025b..4c70ee345f 100644
--- a/phpBB/styles/prosilver/template/editor.js
+++ b/phpBB/styles/prosilver/template/editor.js
@@ -301,7 +301,7 @@ function colorPalette(dir, width, height) {
 	var r = 0, 
 		g = 0, 
 		b = 0,
-		numberList = new Array(6);
+		numberList = new Array(6),
 		color = '',
 		html = '';
 
-- 
cgit v1.2.1


From f421c082f73b26f5578d14af7cdbfefd013f554a Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Thu, 18 Jul 2013 22:41:23 +0200
Subject: [ticket/11713] Do not remove module if it couldn't be deleted

Up to now, the module or module category was always removed with jQuery,
even if there was an error. With this change, the modules will not be deleted
by jQuery if the return JSON array will have SUCCESS set to false.

PHPBB3-11713
---
 phpBB/adm/style/ajax.js            | 6 ++++--
 phpBB/includes/acp/acp_modules.php | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/phpBB/adm/style/ajax.js b/phpBB/adm/style/ajax.js
index 6f21dfa6ac..efb0639f1b 100644
--- a/phpBB/adm/style/ajax.js
+++ b/phpBB/adm/style/ajax.js
@@ -127,8 +127,10 @@ phpbb.addAjaxCallback('activate_deactivate', function(res) {
  * The removes the parent row of the link or form that triggered the callback,
  * and is good for stuff like the removal of forums.
  */
-phpbb.addAjaxCallback('row_delete', function() {
-	$(this).parents('tr').remove();
+phpbb.addAjaxCallback('row_delete', function(res) {
+	if (res.SUCCESS !== false) {
+		$(this).parents('tr').remove();
+	}
 });
 
 
diff --git a/phpBB/includes/acp/acp_modules.php b/phpBB/includes/acp/acp_modules.php
index a1e681b29c..7a1d30196d 100644
--- a/phpBB/includes/acp/acp_modules.php
+++ b/phpBB/includes/acp/acp_modules.php
@@ -379,6 +379,7 @@ class acp_modules
 				$json_response->send(array(
 					'MESSAGE_TITLE'	=> $user->lang('ERROR'),
 					'MESSAGE_TEXT'	=> implode('<br />', $errors),
+					'SUCCESS'	=> false,
 				));
 			}
 
-- 
cgit v1.2.1


From b92f660ed389414a1d8550a5ba92804f7151eb79 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Fri, 19 Jul 2013 13:08:41 -0500
Subject: [ticket/11718] Twig lexer only correcting statements in IF, not
 ELSEIF

PHPBB3-11718
---
 phpBB/phpbb/template/twig/lexer.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/phpBB/phpbb/template/twig/lexer.php b/phpBB/phpbb/template/twig/lexer.php
index 46412ad048..cb44de76f1 100644
--- a/phpBB/phpbb/template/twig/lexer.php
+++ b/phpBB/phpbb/template/twig/lexer.php
@@ -219,19 +219,20 @@ class phpbb_template_twig_lexer extends Twig_Lexer
 	{
 		$callback = function($matches)
 		{
+			$inner = $matches[2];
 			// Replace $TEST with definition.TEST
-			$matches[1] = preg_replace('#\s\$([a-zA-Z_0-9]+)#', ' definition.$1', $matches[1]);
+			$inner = preg_replace('#\s\$([a-zA-Z_0-9]+)#', ' definition.$1', $inner);
 
 			// Replace .test with test|length
-			$matches[1] = preg_replace('#\s\.([a-zA-Z_0-9\.]+)#', ' $1|length', $matches[1]);
+			$inner = preg_replace('#\s\.([a-zA-Z_0-9\.]+)#', ' $1|length', $inner);
 
-			return '<!-- IF' . $matches[1] . '-->';
+			return "<!-- {$matches[1]}IF{$inner}-->";
 		};
 
 		// Replace our "div by" with Twig's divisibleby (Twig does not like test names with spaces)
 		$code = preg_replace('# div by ([0-9]+)#', ' divisibleby($1)', $code);
 
-		return preg_replace_callback('#<!-- IF((.*)[\s][\$|\.|!]([^\s]+)(.*))-->#', $callback, $code);
+		return preg_replace_callback('#<!-- (ELSE)?IF((.*)[\s][\$|\.|!]([^\s]+)(.*))-->#', $callback, $code);
 	}
 
 	/**
-- 
cgit v1.2.1


From 1c59ad87b026794e44ce6c7561feabd3eb7bf165 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Fri, 19 Jul 2013 13:34:08 -0500
Subject: [ticket/11718] Quick test for fixes in ELSEIF

PHPBB3-11718
---
 tests/template/template_test.php     | 2 +-
 tests/template/templates/define.html | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/tests/template/template_test.php b/tests/template/template_test.php
index 802f0c19ba..86af97cc84 100644
--- a/tests/template/template_test.php
+++ b/tests/template/template_test.php
@@ -151,7 +151,7 @@ class phpbb_template_template_test extends phpbb_template_template_test_case
 				array(),
 				array('loop' => array(array(), array(), array(), array(), array(), array(), array()), 'test' => array(array()), 'test.deep' => array(array()), 'test.deep.defines' => array(array())),
 				array(),
-				"xyz\nabc\nabc\nbar\nbar\nabc",
+				"xyz\nabc\n\$VALUE == 'abc'\nabc\nbar\nbar\nabc",
 			),
 			array(
 				'define_advanced.html',
diff --git a/tests/template/templates/define.html b/tests/template/templates/define.html
index 4e6d0ee793..5b8ed9ac40 100644
--- a/tests/template/templates/define.html
+++ b/tests/template/templates/define.html
@@ -2,6 +2,11 @@
 {$VALUE}
 <!-- DEFINE $VALUE = 'abc' -->
 {$VALUE}
+<!-- IF $VALUE != 'abc' -->
+$VALUE != 'abc'
+<!-- ELSEIF $VALUE == 'abc' -->
+$VALUE == 'abc'
+<!-- ENDIF -->
 <!-- INCLUDE define_include.html -->
 {$INCLUDED_VALUE}
 {$VALUE}
-- 
cgit v1.2.1


From 375976eb38882f42155f1f7fa2c849add8dbcf08 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Fri, 19 Jul 2013 14:12:28 -0500
Subject: [ticket/11707] Twig DEFINE not working as expected

PHPBB3-11707
---
 phpBB/phpbb/template/twig/lexer.php  | 12 ++++++++----
 tests/template/template_test.php     |  2 +-
 tests/template/templates/define.html |  2 ++
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/phpBB/phpbb/template/twig/lexer.php b/phpBB/phpbb/template/twig/lexer.php
index 46412ad048..1fa4c5b3e6 100644
--- a/phpBB/phpbb/template/twig/lexer.php
+++ b/phpBB/phpbb/template/twig/lexer.php
@@ -126,10 +126,14 @@ class phpbb_template_twig_lexer extends Twig_Lexer
 	{
 		$callback = function($matches)
 		{
-			// Remove any quotes that may have been used in different implementations
-			// E.g. DEFINE $TEST = 'blah' vs INCLUDE foo
-			// Replace {} with start/end to parse variables (' ~ TEST ~ '.html)
-			$matches[2] = str_replace(array('"', "'", '{', '}'), array('', '', "' ~ ", " ~ '"), $matches[2]);
+			// Remove matching quotes at the beginning/end if a statement;
+			// E.g. 'asdf'"' -> asdf'"
+			// E.g. "asdf'"" -> asdf'"
+			// E.g. 'asdf'" -> 'asdf'"
+			$matches[2] = preg_replace('#^([\'"])?(.+?)\1$#', '$2', $matches[2]);
+
+			// Replace template variables with start/end to parse variables (' ~ TEST ~ '.html)
+			$matches[2] = preg_replace('#{([a-zA-Z0-9_\.$]+)}#', "'~ \$1 ~'", $matches[2]);
 
 			// Surround the matches in single quotes ('' ~ TEST ~ '.html')
 			return "<!-- {$matches[1]} '{$matches[2]}' -->";
diff --git a/tests/template/template_test.php b/tests/template/template_test.php
index 802f0c19ba..2ed0f03698 100644
--- a/tests/template/template_test.php
+++ b/tests/template/template_test.php
@@ -151,7 +151,7 @@ class phpbb_template_template_test extends phpbb_template_template_test_case
 				array(),
 				array('loop' => array(array(), array(), array(), array(), array(), array(), array()), 'test' => array(array()), 'test.deep' => array(array()), 'test.deep.defines' => array(array())),
 				array(),
-				"xyz\nabc\nabc\nbar\nbar\nabc",
+				"xyz\nabc\nabc\nbar\nbar\nabc\ntest!@#$%^&*()_-=+{}[]:;\",<.>/?",
 			),
 			array(
 				'define_advanced.html',
diff --git a/tests/template/templates/define.html b/tests/template/templates/define.html
index 4e6d0ee793..f0df16a8f8 100644
--- a/tests/template/templates/define.html
+++ b/tests/template/templates/define.html
@@ -7,3 +7,5 @@
 {$VALUE}
 <!-- UNDEFINE $VALUE -->
 {$VALUE}
+<!-- DEFINE $VALUE = 'test!@#$%^&*()_-=+{}[]:;",<.>/?' -->
+{$VALUE}
-- 
cgit v1.2.1


From e48f0555e9e40a9e1d3e9a60e25a9f206c565efe Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sat, 20 Jul 2013 14:36:38 +0200
Subject: [ticket/11531] Reduced amount of avatar functional tests to minimum

The tests were reduced to only test one case that should be correct and one
that should fail. Different test cases have been split up over the specific
test files for the acp groups, acp users, ucp groups, and ucp users page.

PHPBB3-11531
---
 tests/functional/avatar_acp_groups_test.php | 89 ----------------------------
 tests/functional/avatar_acp_users_test.php  | 91 -----------------------------
 tests/functional/avatar_ucp_groups_test.php | 80 -------------------------
 tests/functional/avatar_ucp_users_test.php  | 89 ----------------------------
 4 files changed, 349 deletions(-)

diff --git a/tests/functional/avatar_acp_groups_test.php b/tests/functional/avatar_acp_groups_test.php
index 62b7409bdb..9fdc29cc76 100644
--- a/tests/functional/avatar_acp_groups_test.php
+++ b/tests/functional/avatar_acp_groups_test.php
@@ -42,95 +42,6 @@ class phpbb_functional_avatar_acp_groups_test extends phpbb_functional_common_av
 					'avatar_gravatar_height'	=> 120,
 				),
 			),
-			// Incorrect email supplied for gravatar
-			array(
-				'EMAIL_INVALID_EMAIL',
-				'avatar_driver_gravatar',
-				array(
-					'avatar_gravatar_email'		=> 'test.example.com',
-					'avatar_gravatar_width'		=> 80,
-					'avatar_gravatar_height'	=> 80,
-				),
-			),
-			// Upload image from remote
-			array(
-				'GROUP_UPDATED',
-				'avatar_driver_upload',
-				array(
-					'avatar_upload_url'	=> 'https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
-				),
-			),
-			// Incorrect URL
-			array(
-				'AVATAR_URL_INVALID',
-				'avatar_driver_upload',
-				array(
-					'avatar_upload_url'	=> 'https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0?s=80',
-				),
-			),
-			/*
-			// Does not work due to DomCrawler issue
-			// Valid file upload
-			array(
-				'GROUP_UPDATED',
-				'avatar_driver_upload',
-				array(
-					'avatar_upload_file'	=> array('upload', $this->path . 'valid.jpg'),
-				),
-			),
-			*/
-			// Correct remote avatar
-			array(
-				'GROUP_UPDATED',
-				'avatar_driver_remote',
-				array(
-					'avatar_remote_url'	=> 'https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
-					'avatar_remote_width'	=> 80,
-					'avatar_remote_height'	=> 80,
-				),
-			),
-			// Remote avatar with incorrect size
-			array(
-				'The submitted avatar is 120 wide and 120 high. Avatars must be at least 20 wide and 20 high, but no larger than 90 wide and 90 high.',
-				'avatar_driver_remote',
-				array(
-					'avatar_remote_url'	=> 'https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
-					'avatar_remote_width'	=> 120,
-					'avatar_remote_height'	=> 120,
-				),
-			),
-			// Wrong driver selected
-			array(
-				'NO_AVATAR_SELECTED',
-				'avatar_driver_upload',
-				array(
-					'avatar_remote_url'	=> 'https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
-					'avatar_remote_width'	=> 80,
-					'avatar_remote_height'	=> 80,
-				),
-			),
-			// File does not exist, remote avatar currently does
-			// not check if file exists if size is specified
-			array(
-				'GROUP_UPDATED',
-				'avatar_driver_remote',
-				array(
-					'avatar_remote_url'	=> 'https://www.phpbb.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
-					'avatar_remote_width'	=> 80,
-					'avatar_remote_height'	=> 80,
-				),
-			),
-			// File does not exist and remote avatar errors when
-			// trying to get the image size
-			array(
-				'UNABLE_GET_IMAGE_SIZE',
-				'avatar_driver_remote',
-				array(
-					'avatar_remote_url'	=> 'https://www.phpbb.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
-					'avatar_remote_width'	=> '',
-					'avatar_remote_height'	=> '',
-				),
-			),
 			// Delete avatar image to reset group settings
 			array(
 				'GROUP_UPDATED',
diff --git a/tests/functional/avatar_acp_users_test.php b/tests/functional/avatar_acp_users_test.php
index 38ebcc8940..0afd05e530 100644
--- a/tests/functional/avatar_acp_users_test.php
+++ b/tests/functional/avatar_acp_users_test.php
@@ -22,26 +22,6 @@ class phpbb_functional_avatar_acp_users_test extends phpbb_functional_common_ava
 	public function avatar_acp_users_data()
 	{
 		return array(
-			// Correct gravatar
-			array(
-				'USER_AVATAR_UPDATED',
-				'avatar_driver_gravatar',
-				array(
-					'avatar_gravatar_email'		=> 'test@example.com',
-					'avatar_gravatar_width'		=> 80,
-					'avatar_gravatar_height'	=> 80,
-				),
-			),
-			// Gravatar with incorrect sizes
-			array(
-				'The submitted avatar is 120 wide and 120 high. Avatars must be at least 20 wide and 20 high, but no larger than 90 wide and 90 high.',
-				'avatar_driver_gravatar',
-				array(
-					'avatar_gravatar_email'		=> 'test@example.com',
-					'avatar_gravatar_width'		=> 120,
-					'avatar_gravatar_height'	=> 120,
-				),
-			),
 			// Gravatar with incorrect email
 			array(
 				'EMAIL_INVALID_EMAIL',
@@ -60,77 +40,6 @@ class phpbb_functional_avatar_acp_users_test extends phpbb_functional_common_ava
 					'avatar_upload_url'	=> 'https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
 				),
 			),
-			// Incorrect URL
-			array(
-				'AVATAR_URL_INVALID',
-				'avatar_driver_upload',
-				array(
-					'avatar_upload_url'	=> 'https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0?s=80',
-				),
-			),
-			/*
-			// Does not work due to DomCrawler issue
-			// Valid file upload
-			array(
-				'PROFILE_UPDATED',
-				'avatar_driver_upload',
-				array(
-					'avatar_upload_file'	=> array('upload', $this->path . 'valid.jpg'),
-				),
-			),
-			*/
-			// Correct remote avatar
-			array(
-				'USER_AVATAR_UPDATED',
-				'avatar_driver_remote',
-				array(
-					'avatar_remote_url'	=> 'https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
-					'avatar_remote_width'	=> 80,
-					'avatar_remote_height'	=> 80,
-				),
-			),
-			// Remote avatar with incorrect size
-			array(
-				'The submitted avatar is 120 wide and 120 high. Avatars must be at least 20 wide and 20 high, but no larger than 90 wide and 90 high.',
-				'avatar_driver_remote',
-				array(
-					'avatar_remote_url'	=> 'https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
-					'avatar_remote_width'	=> 120,
-					'avatar_remote_height'	=> 120,
-				),
-			),
-			// Wrong driver selected
-			array(
-				'NO_AVATAR_SELECTED',
-				'avatar_driver_upload',
-				array(
-					'avatar_remote_url'	=> 'https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
-					'avatar_remote_width'	=> 80,
-					'avatar_remote_height'	=> 80,
-				),
-			),
-			// File does not exist, remote avatar currently does
-			// not check if file exists if size is specified
-			array(
-				'USER_AVATAR_UPDATED',
-				'avatar_driver_remote',
-				array(
-					'avatar_remote_url'	=> 'https://www.phpbb.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
-					'avatar_remote_width'	=> 80,
-					'avatar_remote_height'	=> 80,
-				),
-			),
-			// File does not exist and remote avatar errors when
-			// trying to get the image size
-			array(
-				'UNABLE_GET_IMAGE_SIZE',
-				'avatar_driver_remote',
-				array(
-					'avatar_remote_url'	=> 'https://www.phpbb.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
-					'avatar_remote_width'	=> '',
-					'avatar_remote_height'	=> '',
-				),
-			),
 			// Reset avatar settings
 			array(
 				'USER_AVATAR_UPDATED',
diff --git a/tests/functional/avatar_ucp_groups_test.php b/tests/functional/avatar_ucp_groups_test.php
index bd34f67491..233b7d36e1 100644
--- a/tests/functional/avatar_ucp_groups_test.php
+++ b/tests/functional/avatar_ucp_groups_test.php
@@ -22,44 +22,6 @@ class phpbb_functional_avatar_ucp_groups_test extends phpbb_functional_common_av
 	public function avatar_ucp_groups_data()
 	{
 		return array(
-			// Gravatar with correct settings
-			array(
-				'GROUP_UPDATED',
-				'avatar_driver_gravatar',
-				array(
-					'avatar_gravatar_email'		=> 'test@example.com',
-					'avatar_gravatar_width'		=> 80,
-					'avatar_gravatar_height'	=> 80,
-				),
-			),
-			// Gravatar with incorrect sizing
-			array(
-				'The submitted avatar is 120 wide and 120 high. Avatars must be at least 20 wide and 20 high, but no larger than 90 wide and 90 high.',
-				'avatar_driver_gravatar',
-				array(
-					'avatar_gravatar_email'		=> 'test@example.com',
-					'avatar_gravatar_width'		=> 120,
-					'avatar_gravatar_height'	=> 120,
-				),
-			),
-			// Gravatar with incorrect email address
-			array(
-				'EMAIL_INVALID_EMAIL',
-				'avatar_driver_gravatar',
-				array(
-					'avatar_gravatar_email'		=> 'test.example.com',
-					'avatar_gravatar_width'		=> 80,
-					'avatar_gravatar_height'	=> 80,
-				),
-			),
-			// Correct remote upload avatar
-			array(
-				'GROUP_UPDATED',
-				'avatar_driver_upload',
-				array(
-					'avatar_upload_url'	=> 'https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
-				),
-			),
 			// Incorrect URL
 			array(
 				'AVATAR_URL_INVALID',
@@ -89,48 +51,6 @@ class phpbb_functional_avatar_ucp_groups_test extends phpbb_functional_common_av
 					'avatar_remote_height'	=> 80,
 				),
 			),
-			// Remote avatar with incorrect size
-			array(
-				'The submitted avatar is 120 wide and 120 high. Avatars must be at least 20 wide and 20 high, but no larger than 90 wide and 90 high.',
-				'avatar_driver_remote',
-				array(
-					'avatar_remote_url'	=> 'https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
-					'avatar_remote_width'	=> 120,
-					'avatar_remote_height'	=> 120,
-				),
-			),
-			// Wrong driver selected
-			array(
-				'NO_AVATAR_SELECTED',
-				'avatar_driver_upload',
-				array(
-					'avatar_remote_url'	=> 'https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
-					'avatar_remote_width'	=> 80,
-					'avatar_remote_height'	=> 80,
-				),
-			),
-			// File does not exist, remote avatar currently does
-			// not check if file exists if size is specified
-			array(
-				'GROUP_UPDATED',
-				'avatar_driver_remote',
-				array(
-					'avatar_remote_url'	=> 'https://www.phpbb.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
-					'avatar_remote_width'	=> 80,
-					'avatar_remote_height'	=> 80,
-				),
-			),
-			// File does not exist and remote avatar errors when
-			// trying to get the image size
-			array(
-				'UNABLE_GET_IMAGE_SIZE',
-				'avatar_driver_remote',
-				array(
-					'avatar_remote_url'	=> 'https://www.phpbb.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
-					'avatar_remote_width'	=> '',
-					'avatar_remote_height'	=> '',
-				),
-			),
 			array(
 				'GROUP_UPDATED',
 				'avatar_driver_gravatar',
diff --git a/tests/functional/avatar_ucp_users_test.php b/tests/functional/avatar_ucp_users_test.php
index 6b2c2344b3..fa6282abf4 100644
--- a/tests/functional/avatar_ucp_users_test.php
+++ b/tests/functional/avatar_ucp_users_test.php
@@ -32,73 +32,6 @@ class phpbb_functional_avatar_ucp_users_test extends phpbb_functional_common_ava
 					'avatar_gravatar_height'	=> 80,
 				),
 			),
-			// Gravatar with incorrect sizing
-			array(
-				'The submitted avatar is 120 wide and 120 high. Avatars must be at least 20 wide and 20 high, but no larger than 90 wide and 90 high.',
-				'avatar_driver_gravatar',
-				array(
-					'avatar_gravatar_email'		=> 'test@example.com',
-					'avatar_gravatar_width'		=> 120,
-					'avatar_gravatar_height'	=> 120,
-				),
-			),
-			// Gravatar with incorrect email address
-			array(
-				'EMAIL_INVALID_EMAIL',
-				'avatar_driver_gravatar',
-				array(
-					'avatar_gravatar_email'		=> 'test.example.com',
-					'avatar_gravatar_width'		=> 80,
-					'avatar_gravatar_height'	=> 80,
-				),
-			),
-			// Correct remote upload avatar
-			array(
-				'PROFILE_UPDATED',
-				'avatar_driver_upload',
-				array(
-					'avatar_upload_url'	=> 'https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
-				),
-			),
-			// Incorrect URL
-			array(
-				'AVATAR_URL_INVALID',
-				'avatar_driver_upload',
-				array(
-					'avatar_upload_url'	=> 'https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0?s=80',
-				),
-			),
-			/*
-			// Does not work due to DomCrawler issue
-			// Valid file upload
-			array(
-				'PROFILE_UPDATED',
-				'avatar_driver_upload',
-				array(
-					'avatar_upload_file'	=> array('upload', $this->path . 'valid.jpg'),
-				),
-			),
-			*/
-			// Correct remote avatar
-			array(
-				'PROFILE_UPDATED',
-				'avatar_driver_remote',
-				array(
-					'avatar_remote_url'	=> 'https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
-					'avatar_remote_width'	=> 80,
-					'avatar_remote_height'	=> 80,
-				),
-			),
-			// Remote avatar with incorrect size
-			array(
-				'The submitted avatar is 120 wide and 120 high. Avatars must be at least 20 wide and 20 high, but no larger than 90 wide and 90 high.',
-				'avatar_driver_remote',
-				array(
-					'avatar_remote_url'	=> 'https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
-					'avatar_remote_width'	=> 120,
-					'avatar_remote_height'	=> 120,
-				),
-			),
 			// Wrong driver selected
 			array(
 				'NO_AVATAR_SELECTED',
@@ -109,28 +42,6 @@ class phpbb_functional_avatar_ucp_users_test extends phpbb_functional_common_ava
 					'avatar_remote_height'	=> 80,
 				),
 			),
-			// File does not exist, remote avatar currently does
-			// not check if file exists if size is specified
-			array(
-				'PROFILE_UPDATED',
-				'avatar_driver_remote',
-				array(
-					'avatar_remote_url'	=> 'https://www.phpbb.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
-					'avatar_remote_width'	=> 80,
-					'avatar_remote_height'	=> 80,
-				),
-			),
-			// File does not exist and remote avatar errors when
-			// trying to get the image size
-			array(
-				'UNABLE_GET_IMAGE_SIZE',
-				'avatar_driver_remote',
-				array(
-					'avatar_remote_url'	=> 'https://www.phpbb.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
-					'avatar_remote_width'	=> '',
-					'avatar_remote_height'	=> '',
-				),
-			),
 			array(
 				'PROFILE_UPDATED',
 				'avatar_driver_gravatar',
-- 
cgit v1.2.1


From fc64e6997f9d54362a7fbe2f7a366fb8ba497deb Mon Sep 17 00:00:00 2001
From: Bruno Ais <brunoaiss@gmail.com>
Date: Sat, 20 Jul 2013 16:24:31 +0100
Subject: [ticket/11638] Fixed typo in the variable name.

sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11638
---
 phpBB/viewtopic.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index 9274539ab4..d18478fbfa 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -1385,7 +1385,7 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i)
 	}
 
 	// Parse the message and subject
-	$message = generate_text_for_display($message, $row['bbcode_uid'], $row['bbcode_bitfield'], ($row['bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0) | OPTION_FLAG_SMILIES, true);
+	$message = generate_text_for_display($row['post_text'], $row['bbcode_uid'], $row['bbcode_bitfield'], ($row['bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0) | OPTION_FLAG_SMILIES, true);
 
 	if (!empty($attachments[$row['post_id']]))
 	{
-- 
cgit v1.2.1


From 73414823048cac8c2963b2034ba13daaf60c3fee Mon Sep 17 00:00:00 2001
From: Bruno Ais <brunoaiss@gmail.com>
Date: Sat, 20 Jul 2013 16:25:05 +0100
Subject: [ticket/11638] Fixed not following guidelines for brackets

sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11638
---
 phpBB/viewtopic.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index d18478fbfa..de76d1186d 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -830,7 +830,8 @@ if (!empty($topic_data['poll_start']))
 
 	$parse_bbcode_flags = OPTION_FLAG_SMILIES;
 	
-	if(empty($poll_info[0]['bbcode_bitfield'])){
+	if(empty($poll_info[0]['bbcode_bitfield']))
+	{
 		$parse_bbcode_flags |= OPTION_FLAG_BBCODE; 
 	}
 
-- 
cgit v1.2.1


From 67ba959d9b34ff727b77206f4c706b1fbe024cb2 Mon Sep 17 00:00:00 2001
From: Bruno Ais <brunoaiss@gmail.com>
Date: Sat, 20 Jul 2013 16:35:28 +0100
Subject: [ticket/11654] first parameter fail

sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11654
---
 phpBB/includes/mcp/mcp_warn.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/includes/mcp/mcp_warn.php b/phpBB/includes/mcp/mcp_warn.php
index d0fcd8a77d..65cf641418 100644
--- a/phpBB/includes/mcp/mcp_warn.php
+++ b/phpBB/includes/mcp/mcp_warn.php
@@ -289,7 +289,7 @@ class mcp_warn
 
 		// We want to make the message available here as a reminder
 		// Parse the message and subject
-		$message = generate_text_for_display($message, $user_row['bbcode_uid'], $user_row['bbcode_bitfield'], ($user_row['bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0) | OPTION_FLAG_SMILIES, true);
+		$message = generate_text_for_display($user_row['post_text'], $user_row['bbcode_uid'], $user_row['bbcode_bitfield'], ($user_row['bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0) | OPTION_FLAG_SMILIES, true);
 
 		// Generate the appropriate user information for the user we are looking at
 		if (!function_exists('phpbb_get_user_avatar'))
-- 
cgit v1.2.1


From 603dc1f78617e64e41f61daf85f463b0465123ec Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sat, 20 Jul 2013 15:09:28 +0200
Subject: [ticket/11717] Use topic_posts_approved instead of topic_replies

Due to the move to soft-delete, the topic_replies column no longer exists
in the topics table. Instead, the column topic_posts_approved should be used.

PHPBB3-11717
---
 phpBB/includes/functions_posting.php | 5 ++++-
 phpBB/includes/ucp/ucp_prefs.php     | 2 +-
 phpBB/phpbb/feed/topic.php           | 2 +-
 phpBB/search.php                     | 4 ++--
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index 03565c27bb..f80736a6c4 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -1995,6 +1995,9 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 		}
 	}
 
+	$first_post_topic_info = ($post_mode == 'edit_first_post' && (($post_visibility == ITEM_DELETED && $data['topic_posts_softdeleted'] == 1) ||
+				($post_visibility == ITEM_UNAPPROVED && $data['topic_posts_unapproved'] == 1) ||
+				($post_visibility == ITEM_APPROVED && $data['topic_posts_approved'] == 1)));
 	// Fix the post's and topic's visibility and first/last post information, when the post is edited
 	if (($post_mode != 'post' && $post_mode != 'reply') && $data['post_visibility'] != $post_visibility)
 	{
@@ -2007,7 +2010,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 		$phpbb_content_visibility = $phpbb_container->get('content.visibility');
 		$phpbb_content_visibility->set_post_visibility($post_visibility, $data['post_id'], $data['topic_id'], $data['forum_id'], $user->data['user_id'], time(), '', $is_starter, $is_latest);
 	}
-	else if ($post_mode == 'edit_last_post' || $post_mode == 'edit_topic' || ($post_mode == 'edit_first_post' && !$data['topic_replies']))
+	else if ($post_mode == 'edit_last_post' || $post_mode == 'edit_topic' || $first_post_topic_info)
 	{
 		if ($post_visibility == ITEM_APPROVED || $data['topic_visibility'] == $post_visibility)
 		{
diff --git a/phpBB/includes/ucp/ucp_prefs.php b/phpBB/includes/ucp/ucp_prefs.php
index 7c3286c1d1..f24578da84 100644
--- a/phpBB/includes/ucp/ucp_prefs.php
+++ b/phpBB/includes/ucp/ucp_prefs.php
@@ -267,7 +267,7 @@ class ucp_prefs
 				$limit_topic_days = array(0 => $user->lang['ALL_TOPICS'], 1 => $user->lang['1_DAY'], 7 => $user->lang['7_DAYS'], 14 => $user->lang['2_WEEKS'], 30 => $user->lang['1_MONTH'], 90 => $user->lang['3_MONTHS'], 180 => $user->lang['6_MONTHS'], 365 => $user->lang['1_YEAR']);
 
 				$sort_by_topic_text = array('a' => $user->lang['AUTHOR'], 't' => $user->lang['POST_TIME'], 'r' => $user->lang['REPLIES'], 's' => $user->lang['SUBJECT'], 'v' => $user->lang['VIEWS']);
-				$sort_by_topic_sql = array('a' => 't.topic_first_poster_name', 't' => 't.topic_last_post_time', 'r' => 't.topic_replies', 's' => 't.topic_title', 'v' => 't.topic_views');
+				$sort_by_topic_sql = array('a' => 't.topic_first_poster_name', 't' => 't.topic_last_post_time', 'r' => 't.topic_posts_approved', 's' => 't.topic_title', 'v' => 't.topic_views');
 
 				// Post ordering options
 				$limit_post_days = array(0 => $user->lang['ALL_POSTS'], 1 => $user->lang['1_DAY'], 7 => $user->lang['7_DAYS'], 14 => $user->lang['2_WEEKS'], 30 => $user->lang['1_MONTH'], 90 => $user->lang['3_MONTHS'], 180 => $user->lang['6_MONTHS'], 365 => $user->lang['1_YEAR']);
diff --git a/phpBB/phpbb/feed/topic.php b/phpBB/phpbb/feed/topic.php
index 36f958ac60..696b0f5a52 100644
--- a/phpBB/phpbb/feed/topic.php
+++ b/phpBB/phpbb/feed/topic.php
@@ -43,7 +43,7 @@ class phpbb_feed_topic extends phpbb_feed_post_base
 
 	function open()
 	{
-		$sql = 'SELECT f.forum_options, f.forum_password, t.topic_id, t.forum_id, t.topic_visibility, t.topic_title, t.topic_time, t.topic_views, t.topic_replies, t.topic_type
+		$sql = 'SELECT f.forum_options, f.forum_password, t.topic_id, t.forum_id, t.topic_visibility, t.topic_title, t.topic_time, t.topic_views, t.topic_posts_approved, t.topic_type
 			FROM ' . TOPICS_TABLE . ' t
 			LEFT JOIN ' . FORUMS_TABLE . ' f
 				ON (f.forum_id = t.forum_id)
diff --git a/phpBB/search.php b/phpBB/search.php
index 2429c81dae..8bcbfc498b 100644
--- a/phpBB/search.php
+++ b/phpBB/search.php
@@ -366,7 +366,7 @@ if ($keywords || $author || $author_id || $search_id || $submit)
 				{
 					$sql = "SELECT p.post_id
 						FROM $sort_join" . POSTS_TABLE . ' p, ' . TOPICS_TABLE . " t
-						WHERE t.topic_replies = 0
+						WHERE t.topic_posts_approved = 1
 							AND p.topic_id = t.topic_id
 							$last_post_time
 							AND $m_approve_posts_fid_sql
@@ -378,7 +378,7 @@ if ($keywords || $author || $author_id || $search_id || $submit)
 				{
 					$sql = 'SELECT DISTINCT ' . $sort_by_sql[$sort_key] . ", p.topic_id
 						FROM $sort_join" . POSTS_TABLE . ' p, ' . TOPICS_TABLE . " t
-						WHERE t.topic_replies = 0
+						WHERE t.topic_posts_approved = 1
 							AND t.topic_moved_id = 0
 							AND p.topic_id = t.topic_id
 							$last_post_time
-- 
cgit v1.2.1


From 56df3fd8cafde10b230c925c7eb455003ae76382 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sat, 20 Jul 2013 22:02:51 +0200
Subject: [ticket/11720] Do not call $captcha->validate if $captcha is not set

PHPBB3-11566 changed big parts of code. Unfortunately, a call to
$captcha->validate was added that is being called even if $captcha hasn't
been initialized. This change will fix this issue.

PHPBB3-11720
---
 phpBB/report.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/phpBB/report.php b/phpBB/report.php
index c92ecdfdcc..c909b4fcf3 100644
--- a/phpBB/report.php
+++ b/phpBB/report.php
@@ -146,10 +146,13 @@ $s_hidden_fields = '';
 // Submit report?
 if ($submit && $reason_id)
 {
-	$visual_confirmation_response = $captcha->validate();
-	if ($visual_confirmation_response)
+	if (isset($captcha))
 	{
-		$error[] = $visual_confirmation_response;
+		$visual_confirmation_response = $captcha->validate();
+		if ($visual_confirmation_response)
+		{
+			$error[] = $visual_confirmation_response;
+		}
 	}
 
 	$sql = 'SELECT *
-- 
cgit v1.2.1


From 865bf0db3d5ca3f8bbadd009ce0a5e8324de49c1 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sat, 20 Jul 2013 22:35:45 +0200
Subject: [ticket/11720] Add functional test for submitting report as user

The already existing functional tests were not ran as the filename was
missing the appended "_test".

PHPBB3-11720
---
 tests/functional/report_post_captcha.php      | 61 -------------------------
 tests/functional/report_post_captcha_test.php | 66 +++++++++++++++++++++++++++
 2 files changed, 66 insertions(+), 61 deletions(-)
 delete mode 100644 tests/functional/report_post_captcha.php
 create mode 100644 tests/functional/report_post_captcha_test.php

diff --git a/tests/functional/report_post_captcha.php b/tests/functional/report_post_captcha.php
deleted file mode 100644
index af713775c5..0000000000
--- a/tests/functional/report_post_captcha.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-/**
- *
- * @package testing
- * @copyright (c) 2013 phpBB Group
- * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
- *
- */
-
-/**
- * @group functional
- */
-class phpbb_functional_report_post_captcha_test extends phpbb_functional_test_case
-{
-	public function test_user_report_post()
-	{
-		$this->login();
-		$crawler = self::request('GET', 'report.php?f=2&p=1');
-		$this->assertNotContains($this->lang('CONFIRM_CODE'), $crawler->filter('html')->text());
-	}
-
-	public function test_guest_report_post()
-	{
-		$crawler = self::request('GET', 'report.php?f=2&p=1');
-		$this->add_lang('mcp');
-		$this->assertContains($this->lang('USER_CANNOT_REPORT'), $crawler->filter('html')->text());
-
-		$this->set_reporting_guest(1);
-		$crawler = self::request('GET', 'report.php?f=2&p=1');
-		$this->assertContains($this->lang('CONFIRM_CODE'), $crawler->filter('html')->text());
-		$this->set_reporting_guest(-1);
-	}
-
-	protected function set_reporting_guest($report_post_allowed)
-	{
-		$this->login();
-		$this->admin_login();
-
-		$crawler = self::request('GET', 'adm/index.php?i=permissions&icat=12&mode=setting_group_local&sid=' . $this->sid);
-		$form = $crawler->selectButton('Submit')->form();
-		$values = $form->getValues();
-		$values["group_id[0]"] = 1;
-		$form->setValues($values);
-		$crawler = self::submit($form);
-
-		$form = $crawler->selectButton('Submit')->form();
-		$values = $form->getValues();
-		$values["forum_id"] = 2;
-		$form->setValues($values);
-		$crawler = self::submit($form);
-
-		$this->add_lang('acp/permissions');
-		$form = $crawler->selectButton($this->lang('APPLY_ALL_PERMISSIONS'))->form();
-		$values = $form->getValues();
-		$values["setting[1][2][f_report]"] = $report_post_allowed;
-		$form->setValues($values);
-		$crawler = self::submit($form);
-
-		$crawler = self::request('GET', 'ucp.php?mode=logout&sid=' . $this->sid);
-	}
-}
diff --git a/tests/functional/report_post_captcha_test.php b/tests/functional/report_post_captcha_test.php
new file mode 100644
index 0000000000..8283465041
--- /dev/null
+++ b/tests/functional/report_post_captcha_test.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ *
+ * @package testing
+ * @copyright (c) 2013 phpBB Group
+ * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+ *
+ */
+
+/**
+ * @group functional
+ */
+class phpbb_functional_report_post_captcha_test extends phpbb_functional_test_case
+{
+	public function test_guest_report_post()
+	{
+		$crawler = self::request('GET', 'report.php?f=2&p=1');
+		$this->add_lang('mcp');
+		$this->assertContains($this->lang('USER_CANNOT_REPORT'), $crawler->filter('html')->text());
+
+		$this->set_reporting_guest(1);
+		$crawler = self::request('GET', 'report.php?f=2&p=1');
+		$this->assertContains($this->lang('CONFIRM_CODE'), $crawler->filter('html')->text());
+		$this->set_reporting_guest(-1);
+	}
+
+	public function test_user_report_post()
+	{
+		$this->login();
+		$crawler = self::request('GET', 'report.php?f=2&p=1');
+		$this->assertNotContains($this->lang('CONFIRM_CODE'), $crawler->filter('html')->text());
+
+		$this->add_lang('mcp');
+		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
+		$crawler = self::submit($form);
+		$this->assertContains($this->lang('POST_REPORTED_SUCCESS'), $crawler->text());
+	}
+
+	protected function set_reporting_guest($report_post_allowed)
+	{
+		$this->login();
+		$this->admin_login();
+
+		$crawler = self::request('GET', 'adm/index.php?i=permissions&icat=12&mode=setting_group_local&sid=' . $this->sid);
+		$form = $crawler->selectButton('Submit')->form();
+		$values = $form->getValues();
+		$values["group_id[0]"] = 1;
+		$form->setValues($values);
+		$crawler = self::submit($form);
+
+		$form = $crawler->selectButton('Submit')->form();
+		$values = $form->getValues();
+		$values["forum_id"] = 2;
+		$form->setValues($values);
+		$crawler = self::submit($form);
+
+		$this->add_lang('acp/permissions');
+		$form = $crawler->selectButton($this->lang('APPLY_ALL_PERMISSIONS'))->form();
+		$values = $form->getValues();
+		$values["setting[1][2][f_report]"] = $report_post_allowed;
+		$form->setValues($values);
+		$crawler = self::submit($form);
+
+		$crawler = self::request('GET', 'ucp.php?mode=logout&sid=' . $this->sid);
+	}
+}
-- 
cgit v1.2.1


From 570e21285bab8f98b45dfa46d0c6b6a8de885055 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Mon, 22 Jul 2013 03:30:27 +0200
Subject: [ticket/11722] Remove reference assignment for $captcha in report.php

PHPBB3-11722
---
 phpBB/report.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/report.php b/phpBB/report.php
index 063e55e571..c9ca57ecbe 100644
--- a/phpBB/report.php
+++ b/phpBB/report.php
@@ -147,7 +147,7 @@ else
 if ($config['enable_post_confirm'] && !$user->data['is_registered'])
 {
 	include($phpbb_root_path . 'includes/captcha/captcha_factory.' . $phpEx);
-	$captcha =& phpbb_captcha_factory::get_instance($config['captcha_plugin']);
+	$captcha = phpbb_captcha_factory::get_instance($config['captcha_plugin']);
 	$captcha->init(CONFIRM_REPORT);
 }
 
-- 
cgit v1.2.1


From effafa4b4d82e8f0debcda2e84e03117433e5a7d Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Mon, 22 Jul 2013 10:42:46 +0200
Subject: [ticket/11717] Add 'has' to boolean variable and reduce line length

PHPBB3-11717
---
 phpBB/includes/functions_posting.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index f80736a6c4..103cc81205 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -1995,9 +1995,10 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 		}
 	}
 
-	$first_post_topic_info = ($post_mode == 'edit_first_post' && (($post_visibility == ITEM_DELETED && $data['topic_posts_softdeleted'] == 1) ||
-				($post_visibility == ITEM_UNAPPROVED && $data['topic_posts_unapproved'] == 1) ||
-				($post_visibility == ITEM_APPROVED && $data['topic_posts_approved'] == 1)));
+	$first_post_has_topic_info = ($post_mode == 'edit_first_post' &&
+			(($post_visibility == ITEM_DELETED && $data['topic_posts_softdeleted'] == 1) ||
+			($post_visibility == ITEM_UNAPPROVED && $data['topic_posts_unapproved'] == 1) ||
+			($post_visibility == ITEM_APPROVED && $data['topic_posts_approved'] == 1)));
 	// Fix the post's and topic's visibility and first/last post information, when the post is edited
 	if (($post_mode != 'post' && $post_mode != 'reply') && $data['post_visibility'] != $post_visibility)
 	{
@@ -2010,7 +2011,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
 		$phpbb_content_visibility = $phpbb_container->get('content.visibility');
 		$phpbb_content_visibility->set_post_visibility($post_visibility, $data['post_id'], $data['topic_id'], $data['forum_id'], $user->data['user_id'], time(), '', $is_starter, $is_latest);
 	}
-	else if ($post_mode == 'edit_last_post' || $post_mode == 'edit_topic' || $first_post_topic_info)
+	else if ($post_mode == 'edit_last_post' || $post_mode == 'edit_topic' || $first_post_has_topic_info)
 	{
 		if ($post_visibility == ITEM_APPROVED || $data['topic_visibility'] == $post_visibility)
 		{
-- 
cgit v1.2.1


From 580131b5c316925107d1c8bed586b1c6044f4c6e Mon Sep 17 00:00:00 2001
From: Bruno Ais <brunoaiss@gmail.com>
Date: Mon, 22 Jul 2013 11:16:47 +0100
Subject: [ticket/11640] removed the unset

sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11640
---
 phpBB/includes/functions_privmsgs.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index 001cf7bba0..15907feedd 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -2023,7 +2023,6 @@ function message_history($msg_id, $user_id, $message_row, $folder, $in_post_mode
 		$parse_flags |= ($row['enable_smilies'] ? OPTION_FLAG_SMILIES : 0);
 		
 		$message = generate_text_for_display($message, $row['bbcode_uid'], $row['bbcode_bitfield'], $parse_flags , false);
-		unset($parse_flags);
 
 		$subject = censor_text($subject);
 
-- 
cgit v1.2.1


From 128af41a7ce983a1b54406e5c467e40b14af7afc Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Mon, 22 Jul 2013 12:47:32 +0200
Subject: [ticket/11725] Use new paths for phpbb_class_loader in file.php

In the PR #1559, the paths were changed from "{$phpbb_root_path}includes/" to
"{$phpbb_root_path}phpbb/" for the class loader. However, this was not changed
in all files that use it.

PHPBB3-11725
---
 phpBB/download/file.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/phpBB/download/file.php b/phpBB/download/file.php
index cf7128b25b..5a091db7c7 100644
--- a/phpBB/download/file.php
+++ b/phpBB/download/file.php
@@ -41,7 +41,7 @@ if (isset($_GET['avatar']))
 		exit;
 	}
 
-	require($phpbb_root_path . 'includes/class_loader.' . $phpEx);
+	require($phpbb_root_path . 'phpbb/class_loader.' . $phpEx);
 
 	require($phpbb_root_path . 'includes/constants.' . $phpEx);
 	require($phpbb_root_path . 'includes/functions.' . $phpEx);
@@ -50,7 +50,7 @@ if (isset($_GET['avatar']))
 	require($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx);
 
 	// Setup class loader first
-	$phpbb_class_loader = new phpbb_class_loader('phpbb_', "{$phpbb_root_path}includes/", $phpEx);
+	$phpbb_class_loader = new phpbb_class_loader('phpbb_', "{$phpbb_root_path}phpbb/", $phpEx);
 	$phpbb_class_loader->register();
 	$phpbb_class_loader_ext = new phpbb_class_loader('phpbb_ext_', "{$phpbb_root_path}ext/", $phpEx);
 	$phpbb_class_loader_ext->register();
-- 
cgit v1.2.1


From 2eb32ef515c59b19bd1bb4f7e6d56736733ea9d8 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Mon, 22 Jul 2013 13:38:19 +0200
Subject: [ticket/11531] Check if uploaded avatar is properly displayed in
 tests

PHPBB3-11531
---
 tests/functional/avatar_ucp_users_test.php | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/tests/functional/avatar_ucp_users_test.php b/tests/functional/avatar_ucp_users_test.php
index fa6282abf4..f828559e0d 100644
--- a/tests/functional/avatar_ucp_users_test.php
+++ b/tests/functional/avatar_ucp_users_test.php
@@ -59,4 +59,20 @@ class phpbb_functional_avatar_ucp_users_test extends phpbb_functional_common_ava
 	{
 		$this->assert_avatar_submit($expected, $avatar_type, $data);
 	}
+
+	public function test_display_upload_avatar()
+	{
+		$this->assert_avatar_submit('PROFILE_UPDATED',
+			'avatar_driver_upload',
+			array(
+				'avatar_upload_url'	=> 'https://secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg',
+			)
+		);
+
+		$crawler = self::request('GET', $this->get_url() . '&sid=' . $this->sid);
+		$avatar_link = $crawler->filter('img')->attr('src');
+		$crawler = self::request('GET', $avatar_link . '&sid=' . $this->sid, array(), false);
+		$content = self::$client->getResponse()->getContent();
+		self::assertEquals(false, stripos(trim($content), 'debug'), 'Output contains debug message');
+	}
 }
-- 
cgit v1.2.1


From 43538fdca15b9b6cd1d64a7808b4e4a4d2027221 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Mon, 22 Jul 2013 12:23:53 -0500
Subject: [ticket/11726] Don't run lint tests on Travis on postgres

PHPBB3-11726
---
 travis/phpunit-postgres-travis.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/travis/phpunit-postgres-travis.xml b/travis/phpunit-postgres-travis.xml
index 3d1b574716..aa829f4d30 100644
--- a/travis/phpunit-postgres-travis.xml
+++ b/travis/phpunit-postgres-travis.xml
@@ -17,9 +17,6 @@
 			<exclude>tests/functional</exclude>
 			<exclude>tests/lint_test.php</exclude>
 		</testsuite>
-		<testsuite name="phpBB Lint Test">
-			<file>tests/lint_test.php</file>
-		</testsuite>
 		<testsuite name="phpBB Functional Tests">
 			<directory suffix="_test.php" phpVersion="5.3.19" phpVersionOperator=">=">../tests/functional</directory>
 		</testsuite>
-- 
cgit v1.2.1


From 62d7a0570071bb572fa60e502596d21eaee57376 Mon Sep 17 00:00:00 2001
From: asperous <asperous2@gmail.com>
Date: Thu, 11 Jul 2013 14:58:41 -0700
Subject: [ticket/11620] Abstracted session setUp into a test_case class

When defining a database test case with a setUp function, it is important
to call the parent's setup function, because that is when the database is setup.

PHPBB3-11620
---
 tests/session/create_test.php                    | 16 ++------------
 tests/session/extract_hostname_test.php          | 16 ++------------
 tests/session/extract_page_test.php              | 16 ++------------
 tests/session/validate_referrer_test.php         | 16 ++------------
 tests/test_framework/phpbb_session_test_case.php | 27 ++++++++++++++++++++++++
 5 files changed, 35 insertions(+), 56 deletions(-)
 create mode 100644 tests/test_framework/phpbb_session_test_case.php

diff --git a/tests/session/create_test.php b/tests/session/create_test.php
index 4a7484321c..a8248ae62c 100644
--- a/tests/session/create_test.php
+++ b/tests/session/create_test.php
@@ -7,27 +7,15 @@
  *
  */
 
-require_once dirname(__FILE__) . '/testable_facade.php';
+require_once dirname(__FILE__) . '/../test_framework/phpbb_session_test_case.php';
 
-class phpbb_session_create_test extends phpbb_database_test_case
+class phpbb_session_create_test extends phpbb_session_test_case
 {
-	public $session_factory;
-	public $db;
-	public $session_facade;
-
 	public function getDataSet()
 	{
 		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/sessions_full.xml');
 	}
 
-	public function setUp()
-	{
-		$this->session_factory = new phpbb_session_testable_factory;
-		$this->db = $this->new_dbal();
-		$this->session_facade =
-			new phpbb_session_testable_facade($this->db, $this->session_factory);
-	}
-
 	static function bot($bot_agent, $user_id, $bot_ip)
 	{
 		return array(array(
diff --git a/tests/session/extract_hostname_test.php b/tests/session/extract_hostname_test.php
index cd71f82b17..5ff43cbb60 100644
--- a/tests/session/extract_hostname_test.php
+++ b/tests/session/extract_hostname_test.php
@@ -7,27 +7,15 @@
  *
  */
 
-require_once dirname(__FILE__) . '/testable_facade.php';
+require_once dirname(__FILE__) . '/../test_framework/phpbb_session_test_case.php';
 
-class phpbb_session_extract_hostname_test extends phpbb_database_test_case
+class phpbb_session_extract_hostname_test extends phpbb_session_test_case
 {
-	public $session_factory;
-	public $db;
-	public $session_facade;
-
 	public function getDataSet()
 	{
 		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/sessions_empty.xml');
 	}
 
-	public function setUp()
-	{
-		$this->session_factory = new phpbb_session_testable_factory;
-		$this->db = $this->new_dbal();
-		$this->session_facade =
-			new phpbb_session_testable_facade($this->db, $this->session_factory);
-	}
-
 	static public function extract_current_hostname_data()
 	{
 		return array (
diff --git a/tests/session/extract_page_test.php b/tests/session/extract_page_test.php
index c17845526f..9346973bc4 100644
--- a/tests/session/extract_page_test.php
+++ b/tests/session/extract_page_test.php
@@ -7,27 +7,15 @@
  *
  */
 
-require_once dirname(__FILE__) . '/testable_facade.php';
+require_once dirname(__FILE__) . '/../test_framework/phpbb_session_test_case.php';
 
-class phpbb_session_extract_page_test extends phpbb_database_test_case
+class phpbb_session_extract_page_test extends phpbb_session_test_case
 {
-	public $session_factory;
-	public $db;
-	public $session_facade;
-
 	public function getDataSet()
 	{
 		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/sessions_empty.xml');
 	}
 
-	public function setUp()
-	{
-		$this->session_factory = new phpbb_session_testable_factory;
-		$this->db = $this->new_dbal();
-		$this->session_facade =
-			new phpbb_session_testable_facade($this->db, $this->session_factory);
-	}
-
 	static public function extract_current_page_data()
 	{
 		return array(
diff --git a/tests/session/validate_referrer_test.php b/tests/session/validate_referrer_test.php
index 1428187f27..f91ac5f1f9 100644
--- a/tests/session/validate_referrer_test.php
+++ b/tests/session/validate_referrer_test.php
@@ -7,27 +7,15 @@
  *
  */
 
-require_once dirname(__FILE__) . '/testable_facade.php';
+require_once dirname(__FILE__) . '/../test_framework/phpbb_session_test_case.php';
 
-class phpbb_session_validate_referrer_test extends phpbb_database_test_case
+class phpbb_session_validate_referrer_test extends phpbb_session_test_case
 {
-	public $session_factory;
-	public $db;
-	public $session_facade;
-
 	public function getDataSet()
 	{
 		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/sessions_empty.xml');
 	}
 
-	public function setUp()
-	{
-		$this->session_factory = new phpbb_session_testable_factory;
-		$this->db = $this->new_dbal();
-		$this->session_facade =
-			new phpbb_session_testable_facade($this->db, $this->session_factory);
-	}
-
 	static function referrer_inputs() {
 		$ex = "example.org";
 		$alt = "example.com";
diff --git a/tests/test_framework/phpbb_session_test_case.php b/tests/test_framework/phpbb_session_test_case.php
new file mode 100644
index 0000000000..6ff7d8e2ef
--- /dev/null
+++ b/tests/test_framework/phpbb_session_test_case.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ *
+ * @package testing
+ * @copyright (c) 2013 phpBB Group
+ * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+ *
+ */
+
+require_once dirname(__FILE__) . '/../session/testable_factory.php';
+require_once dirname(__FILE__) . '/../session/testable_facade.php';
+
+abstract class phpbb_session_test_case extends phpbb_database_test_case
+{
+	protected $session_factory;
+	protected $session_facade;
+	protected $db;
+
+	function setUp()
+	{
+		parent::setUp();
+		$this->session_factory = new phpbb_session_testable_factory;
+		$this->db = $this->new_dbal();
+		$this->session_facade =
+			new phpbb_session_testable_facade($this->db, $this->session_factory);
+	}
+}
-- 
cgit v1.2.1


From 0f708646241ed43c86793d8cbe0b5fea7397f0e6 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 22 Jul 2013 20:06:30 +0200
Subject: [ticket/11582] Move global declaration to beginning of block

PHPBB3-11582
---
 phpBB/includes/acp/acp_permission_roles.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/phpBB/includes/acp/acp_permission_roles.php b/phpBB/includes/acp/acp_permission_roles.php
index 5657cbe675..17e48d6576 100644
--- a/phpBB/includes/acp/acp_permission_roles.php
+++ b/phpBB/includes/acp/acp_permission_roles.php
@@ -25,7 +25,7 @@ class acp_permission_roles
 
 	function main($id, $mode)
 	{
-		global $db, $user, $auth, $template, $cache;
+		global $db, $user, $auth, $template, $cache, $phpbb_container;
 		global $config, $phpbb_root_path, $phpbb_admin_path, $phpEx;
 
 		include_once($phpbb_root_path . 'includes/functions_user.' . $phpEx);
@@ -306,7 +306,6 @@ class acp_permission_roles
 					trigger_error($user->lang['NO_ROLE_SELECTED'] . adm_back_link($this->u_action), E_USER_WARNING);
 				}
 
-				global $phpbb_container;
 				$phpbb_permissions = $phpbb_container->get('acl.permissions');
 
 				$template->assign_vars(array(
-- 
cgit v1.2.1


From 87e65224d45c0571e90e00156abd165bd6bbe059 Mon Sep 17 00:00:00 2001
From: Andy Chase <asperous2@gmail.com>
Date: Mon, 22 Jul 2013 11:07:17 -0700
Subject: [ticket/11620] Cherry-Pick merge tests from session-storage-cache

PHPBB3-11620
---
 tests/session/testable_facade.php  | 16 +++++++------
 tests/session/unset_admin_test.php | 48 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+), 7 deletions(-)
 create mode 100644 tests/session/unset_admin_test.php

diff --git a/tests/session/testable_facade.php b/tests/session/testable_facade.php
index b9f61b80cb..1cb1c94b52 100644
--- a/tests/session/testable_facade.php
+++ b/tests/session/testable_facade.php
@@ -77,14 +77,16 @@ class phpbb_session_testable_facade
 	function session_begin (
 		$update_session_page = true,
 		$config_overrides = array(),
-		$request_overrides = array()
+		$request_overrides = array(),
+		$cookies_overrides = array()
 	)
 	{
+		$this->session_factory->merge_config_data($config_overrides);
+		$this->session_factory->merge_server_data($request_overrides);
+		$this->session_factory->set_cookies($cookies_overrides);
 		$session = $this->session_factory->get_session($this->db);
-		global $config, $request;
-		$request->merge(phpbb_request_interface::SERVER, $request_overrides);
-		$config = array_merge($config, $config_overrides);
-		return $session->session_begin($update_session_page);
+		$session->session_begin($update_session_page);
+		return $session;
 	}
 
 	function session_create (
@@ -93,8 +95,8 @@ class phpbb_session_testable_facade
 		$persist_login = false,
 		$viewonline = true,
 		array $config_overrides = array(),
-		$user_agent,
-		$ip_address,
+		$user_agent = 'user agent',
+		$ip_address = '127.0.0.1',
 		array $bot_overrides = array(),
 		$uri_sid = ""
 	)
diff --git a/tests/session/unset_admin_test.php b/tests/session/unset_admin_test.php
new file mode 100644
index 0000000000..bbb5eb1439
--- /dev/null
+++ b/tests/session/unset_admin_test.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ *
+ * @package testing
+ * @copyright (c) 2013 phpBB Group
+ * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+ *
+ */
+
+require_once dirname(__FILE__) . '/../test_framework/phpbb_session_test_case.php';
+
+class phpbb_session_unset_admin_test extends phpbb_session_test_case
+{
+	public function getDataSet()
+	{
+		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/sessions_full.xml');
+	}
+
+	function get_test_session()
+	{
+		return $this->session_facade->session_begin(
+			true,
+			// Config
+			array(
+				'session_length' => time(), // need to do this to allow sessions started at time 0
+			),
+			// Server
+			array(
+				'HTTP_USER_AGENT' => "user agent",
+				'REMOTE_ADDR' => "127.0.0.1",
+			),
+			// Cookies
+			array(
+				'_sid' => 'bar_session000000000000000000000',
+				'_u' => 4,
+			)
+		);
+	}
+
+	public function test_unset_admin()
+	{
+		$session = $this->get_test_session();
+		$this->assertEquals(1, $session->data['session_admin'], 'should be an admin before test starts');
+		$session->unset_admin();
+		$session = $this->get_test_session();
+		$this->assertEquals(0, $session->data['session_admin'], 'should be not be an admin after unset_admin');
+	}
+}
-- 
cgit v1.2.1


From f7da773c06534cd9b359bc5e6430469c2ff9a4bc Mon Sep 17 00:00:00 2001
From: asperous <asperous2@gmail.com>
Date: Thu, 11 Jul 2013 20:23:12 -0700
Subject: [ticket/11620] Added manual key test

PHPBB3-11620
---
 tests/session/fixtures/sessions_key.xml | 44 +++++++++++++++++++++++++++++++++
 tests/session/session_key_tests.php     | 28 +++++++++++++++++++++
 2 files changed, 72 insertions(+)
 create mode 100644 tests/session/fixtures/sessions_key.xml
 create mode 100644 tests/session/session_key_tests.php

diff --git a/tests/session/fixtures/sessions_key.xml b/tests/session/fixtures/sessions_key.xml
new file mode 100644
index 0000000000..246d284557
--- /dev/null
+++ b/tests/session/fixtures/sessions_key.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<dataset>
+    <table name="phpbb_sessions_keys">
+        <column>key_id</column>
+        <column>user_id</column>
+        <column>last_ip</column>
+        <column>last_login</column>
+        <row>
+            <value>a87ff679a2f3e71d9181a67b7542122c</value>
+            <value>4</value>
+            <value>127.0.0.1</value>
+            <value>0</value>
+        </row>
+    </table>
+    <table name="phpbb_sessions">
+        <column>session_id</column>
+        <column>session_user_id</column>
+        <column>session_ip</column>
+        <column>session_browser</column>
+        <row>
+            <value>bar_session000000000000000000000</value>
+            <value>4</value>
+            <value>127.0.0.1</value>
+            <value>user agent</value>
+            <value>1</value>
+        </row>
+    </table>
+    <table name="phpbb_users">
+        <column>user_id</column>
+        <column>username_clean</column>
+        <column>user_permissions</column>
+        <column>user_sig</column>
+        <column>user_occ</column>
+        <column>user_interests</column>
+        <row>
+            <value>4</value>
+            <value>bar</value>
+            <value></value>
+            <value></value>
+            <value></value>
+            <value></value>
+        </row>
+    </table>
+</dataset>
diff --git a/tests/session/session_key_tests.php b/tests/session/session_key_tests.php
new file mode 100644
index 0000000000..382ed06a15
--- /dev/null
+++ b/tests/session/session_key_tests.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ *
+ * @package testing
+ * @copyright (c) 2013 phpBB Group
+ * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+ *
+ */
+
+require_once dirname(__FILE__) . '/../test_framework/phpbb_session_test_case.php';
+
+class phpbb_session_login_keys_test extends phpbb_session_test_case
+{
+	public function getDataSet()
+	{
+		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/sessions_key.xml');
+	}
+
+	public function test_set_key_manually()
+	{
+		$this->session_factory->merge_config_data(array('allow_autologin' => true));
+		$session = $this->session_factory->get_session($this->db);
+		$session->cookie_data['u'] = 4;
+		$session->cookie_data['k'] = 4;
+		$session->session_create(4, false, 4);
+		$this->assertEquals(4, $session->data['user_id']);
+	}
+}
-- 
cgit v1.2.1


From f5a09858d044592fa027e5ce23f4060aec0c38fa Mon Sep 17 00:00:00 2001
From: asperous <asperous2@gmail.com>
Date: Fri, 12 Jul 2013 07:15:46 -0700
Subject: [ticket/11620] Added a session key reset test

PHPBB3-11620
---
 tests/session/session_key_tests.php | 33 ++++++++++++++++++++++++++++-----
 1 file changed, 28 insertions(+), 5 deletions(-)

diff --git a/tests/session/session_key_tests.php b/tests/session/session_key_tests.php
index 382ed06a15..bc3d6dd71c 100644
--- a/tests/session/session_key_tests.php
+++ b/tests/session/session_key_tests.php
@@ -1,4 +1,4 @@
-<?php
+_<?php
 /**
  *
  * @package testing
@@ -11,6 +11,9 @@ require_once dirname(__FILE__) . '/../test_framework/phpbb_session_test_case.php
 
 class phpbb_session_login_keys_test extends phpbb_session_test_case
 {
+	protected $user_id = 4;
+	protected $key_id = 4;
+
 	public function getDataSet()
 	{
 		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/sessions_key.xml');
@@ -18,11 +21,31 @@ class phpbb_session_login_keys_test extends phpbb_session_test_case
 
 	public function test_set_key_manually()
 	{
+		// With AutoLogin setup
+		$this->session_factory->merge_config_data(array('allow_autologin' => true));
+		$session = $this->session_factory->get_session($this->db);
+		// Using a user_id and key that is already in the database
+		$session->cookie_data['u'] = $this->user_id;
+		$session->cookie_data['k'] = $this->key_id;
+		// Try to access session
+		$session->session_create($this->user_id, false, $this->user_id);
+
+		$this->assertEquals($this->user_id, $session->data['user_id'], "session should automatically login");
+	}
+
+	public function test_reset_keys()
+	{
+		// With AutoLogin setup
 		$this->session_factory->merge_config_data(array('allow_autologin' => true));
 		$session = $this->session_factory->get_session($this->db);
-		$session->cookie_data['u'] = 4;
-		$session->cookie_data['k'] = 4;
-		$session->session_create(4, false, 4);
-		$this->assertEquals(4, $session->data['user_id']);
+		// Reset of the keys for this user
+		$session->reset_login_keys($this->user_id);
+		// Using a user_id and key that was in the database (before reset)
+		$session->cookie_data['u'] = $this->user_id;
+		$session->cookie_data['k'] = $this->key_id;
+		// Try to access session
+		$session->session_create($this->user_id, false, $this->user_id);
+
+		$this->assertNotEquals($this->user_id, $session->data['user_id'], "session should be cleared");
 	}
 }
-- 
cgit v1.2.1


From 750ea771084d96097ea5a22c11a6659e8f39869d Mon Sep 17 00:00:00 2001
From: asperous <asperous2@gmail.com>
Date: Fri, 12 Jul 2013 07:20:46 -0700
Subject: [ticket/11620] Typo in file name session_key_tests -> test

PHPBB3-11620
---
 tests/session/session_key_test.php  | 51 +++++++++++++++++++++++++++++++++++++
 tests/session/session_key_tests.php | 51 -------------------------------------
 2 files changed, 51 insertions(+), 51 deletions(-)
 create mode 100644 tests/session/session_key_test.php
 delete mode 100644 tests/session/session_key_tests.php

diff --git a/tests/session/session_key_test.php b/tests/session/session_key_test.php
new file mode 100644
index 0000000000..bc3d6dd71c
--- /dev/null
+++ b/tests/session/session_key_test.php
@@ -0,0 +1,51 @@
+_<?php
+/**
+ *
+ * @package testing
+ * @copyright (c) 2013 phpBB Group
+ * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+ *
+ */
+
+require_once dirname(__FILE__) . '/../test_framework/phpbb_session_test_case.php';
+
+class phpbb_session_login_keys_test extends phpbb_session_test_case
+{
+	protected $user_id = 4;
+	protected $key_id = 4;
+
+	public function getDataSet()
+	{
+		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/sessions_key.xml');
+	}
+
+	public function test_set_key_manually()
+	{
+		// With AutoLogin setup
+		$this->session_factory->merge_config_data(array('allow_autologin' => true));
+		$session = $this->session_factory->get_session($this->db);
+		// Using a user_id and key that is already in the database
+		$session->cookie_data['u'] = $this->user_id;
+		$session->cookie_data['k'] = $this->key_id;
+		// Try to access session
+		$session->session_create($this->user_id, false, $this->user_id);
+
+		$this->assertEquals($this->user_id, $session->data['user_id'], "session should automatically login");
+	}
+
+	public function test_reset_keys()
+	{
+		// With AutoLogin setup
+		$this->session_factory->merge_config_data(array('allow_autologin' => true));
+		$session = $this->session_factory->get_session($this->db);
+		// Reset of the keys for this user
+		$session->reset_login_keys($this->user_id);
+		// Using a user_id and key that was in the database (before reset)
+		$session->cookie_data['u'] = $this->user_id;
+		$session->cookie_data['k'] = $this->key_id;
+		// Try to access session
+		$session->session_create($this->user_id, false, $this->user_id);
+
+		$this->assertNotEquals($this->user_id, $session->data['user_id'], "session should be cleared");
+	}
+}
diff --git a/tests/session/session_key_tests.php b/tests/session/session_key_tests.php
deleted file mode 100644
index bc3d6dd71c..0000000000
--- a/tests/session/session_key_tests.php
+++ /dev/null
@@ -1,51 +0,0 @@
-_<?php
-/**
- *
- * @package testing
- * @copyright (c) 2013 phpBB Group
- * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
- *
- */
-
-require_once dirname(__FILE__) . '/../test_framework/phpbb_session_test_case.php';
-
-class phpbb_session_login_keys_test extends phpbb_session_test_case
-{
-	protected $user_id = 4;
-	protected $key_id = 4;
-
-	public function getDataSet()
-	{
-		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/sessions_key.xml');
-	}
-
-	public function test_set_key_manually()
-	{
-		// With AutoLogin setup
-		$this->session_factory->merge_config_data(array('allow_autologin' => true));
-		$session = $this->session_factory->get_session($this->db);
-		// Using a user_id and key that is already in the database
-		$session->cookie_data['u'] = $this->user_id;
-		$session->cookie_data['k'] = $this->key_id;
-		// Try to access session
-		$session->session_create($this->user_id, false, $this->user_id);
-
-		$this->assertEquals($this->user_id, $session->data['user_id'], "session should automatically login");
-	}
-
-	public function test_reset_keys()
-	{
-		// With AutoLogin setup
-		$this->session_factory->merge_config_data(array('allow_autologin' => true));
-		$session = $this->session_factory->get_session($this->db);
-		// Reset of the keys for this user
-		$session->reset_login_keys($this->user_id);
-		// Using a user_id and key that was in the database (before reset)
-		$session->cookie_data['u'] = $this->user_id;
-		$session->cookie_data['k'] = $this->key_id;
-		// Try to access session
-		$session->session_create($this->user_id, false, $this->user_id);
-
-		$this->assertNotEquals($this->user_id, $session->data['user_id'], "session should be cleared");
-	}
-}
-- 
cgit v1.2.1


From 016faad6682495a35566d2d0451697486a47e80c Mon Sep 17 00:00:00 2001
From: asperous <asperous2@gmail.com>
Date: Fri, 12 Jul 2013 09:47:06 -0700
Subject: [ticket/11620] Remove typo in beginning of session_key_test

PHPBB3-11620
---
 tests/session/session_key_test.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/session/session_key_test.php b/tests/session/session_key_test.php
index bc3d6dd71c..6406742168 100644
--- a/tests/session/session_key_test.php
+++ b/tests/session/session_key_test.php
@@ -1,4 +1,4 @@
-_<?php
+<?php
 /**
  *
  * @package testing
-- 
cgit v1.2.1


From d533e8807c1f88bd1e3c30ca518e795403b521ff Mon Sep 17 00:00:00 2001
From: asperous <asperous2@gmail.com>
Date: Fri, 12 Jul 2013 09:54:38 -0700
Subject: [ticket/11620] Added a test for checking if users are banned

PHPBB3-11620
---
 tests/mock/session_testable.php             |  4 ++
 tests/session/check_ban_test.php            | 51 ++++++++++++++++++++++
 tests/session/fixtures/sessions_banlist.xml | 66 +++++++++++++++++++++++++++++
 3 files changed, 121 insertions(+)
 create mode 100644 tests/session/check_ban_test.php
 create mode 100644 tests/session/fixtures/sessions_banlist.xml

diff --git a/tests/mock/session_testable.php b/tests/mock/session_testable.php
index 56ff8c8b32..283f9af192 100644
--- a/tests/mock/session_testable.php
+++ b/tests/mock/session_testable.php
@@ -58,5 +58,9 @@ class phpbb_mock_session_testable extends phpbb_session
 			}
 		}
 	}
+
+	public function setup()
+	{
+	}
 }
 
diff --git a/tests/session/check_ban_test.php b/tests/session/check_ban_test.php
new file mode 100644
index 0000000000..ec1f5e3aa1
--- /dev/null
+++ b/tests/session/check_ban_test.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ *
+ * @package testing
+ * @copyright (c) 2013 phpBB Group
+ * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+ *
+ */
+
+require_once dirname(__FILE__) . '/../test_framework/phpbb_session_test_case.php';
+
+class phpbb_session_check_ban_test extends phpbb_session_test_case
+{
+	protected $user_id = 4;
+	protected $key_id = 4;
+
+	public function getDataSet()
+	{
+		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/sessions_banlist.xml');
+	}
+
+	static function check_banned_data()
+	{
+		return array(
+		    array('All false values, should not be banned',
+				 false, false, false, false, /* ?: */ false),
+			array('Matching values in the database, should be banned',
+				 4, '127.0.0.1', 'bar@example.org', true, /* ?: */ true),
+			array('IP Banned, should be banned',
+			     false, '127.1.1.1', false, falseN, /* ?: */ true),
+		);
+	}
+
+	/** @dataProvider check_banned_data */
+	public function test_check_is_banned($test_msg, $user_id, $user_ips, $user_email, $return, $should_be_banned)
+	{
+		$session = $this->session_factory->get_session($this->db);
+		// Change the global cache object for this test because
+		// the mock cache object does not hit the database as is
+		// needed for this test.
+		global $cache;
+		$old_cache = $cache;
+		$cache = new phpbb_cache_driver_file();
+
+		$is_banned =
+			$session->check_ban($user_id, $user_ips, $user_email, $return);
+		$this->assertEquals($should_be_banned, $is_banned, $test_msg);
+
+		$cache = $old_cache;
+	}
+}
diff --git a/tests/session/fixtures/sessions_banlist.xml b/tests/session/fixtures/sessions_banlist.xml
new file mode 100644
index 0000000000..9422fc0665
--- /dev/null
+++ b/tests/session/fixtures/sessions_banlist.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<dataset>
+	<table name="phpbb_users">
+		<column>user_id</column>
+		<column>username_clean</column>
+		<column>user_permissions</column>
+		<column>user_sig</column>
+		<column>user_occ</column>
+		<column>user_interests</column>
+		<row>
+			<value>1</value>
+			<value>anonymous</value>
+			<value></value>
+			<value></value>
+			<value></value>
+			<value></value>
+		</row>
+    </table>
+    <table name="phpbb_sessions">
+		<column>session_id</column>
+		<column>session_user_id</column>
+		<column>session_ip</column>
+		<column>session_browser</column>
+		<column>session_admin</column>
+		<row>
+			<value>bar_session000000000000000000000</value>
+			<value>4</value>
+            <value>127.0.0.1</value>
+			<value>user agent</value>
+			<value>1</value>
+		</row>
+	</table>
+	<table name="phpbb_banlist">
+        <column>ban_id</column>
+        <column>ban_userid</column>
+        <column>ban_ip</column>
+        <column>ban_email</column>
+        <column>ban_start</column>
+        <column>ban_end</column>
+        <column>ban_exclude</column>
+        <column>ban_reason</column>
+        <column>ban_give_reason</column>
+        <row>
+            <value>2</value>
+            <value>4</value>
+            <value>127.0.0.1</value>
+            <value>bar@example.org</value>
+            <value>1111</value>
+            <value>0</value>
+            <value>0</value>
+            <value>HAHAHA</value>
+            <value>1</value>
+        </row>
+        <row>
+            <value>3</value>
+            <value>0</value>
+            <value>127.1.1.1</value>
+            <value></value>
+            <value>1111</value>
+            <value>0</value>
+            <value>0</value>
+            <value>HAHAHA</value>
+            <value>1</value>
+        </row>
+    </table>
+</dataset>
-- 
cgit v1.2.1


From 362480263cbad6cabbe2637edca153b27d97c493 Mon Sep 17 00:00:00 2001
From: Andy Chase <asperous2@gmail.com>
Date: Tue, 25 Jun 2013 12:20:42 -0700
Subject: [ticket/11615]  Rename continue -> check_isvalid for clarity

PHPBB3-11615
---
 tests/session/check_isvalid_test.php | 133 +++++++++++++++++++++++++++++++++++
 tests/session/continue_test.php      | 133 -----------------------------------
 2 files changed, 133 insertions(+), 133 deletions(-)
 create mode 100644 tests/session/check_isvalid_test.php
 delete mode 100644 tests/session/continue_test.php

diff --git a/tests/session/check_isvalid_test.php b/tests/session/check_isvalid_test.php
new file mode 100644
index 0000000000..7cc6f13286
--- /dev/null
+++ b/tests/session/check_isvalid_test.php
@@ -0,0 +1,133 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+require_once dirname(__FILE__) . '/testable_factory.php';
+
+class phpbb_session_check_isvalid_test extends phpbb_database_test_case
+{
+	public function getDataSet()
+	{
+		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/sessions_full.xml');
+	}
+
+	static public function session_begin_attempts()
+	{
+		// The session_id field is defined as CHAR(32) in the database schema.
+		// Thus the data we put in session_id fields has to have a length of 32 characters on stricter DBMSes.
+		// Thus we fill those strings up with zeroes until they have a string length of 32.
+
+		return array(
+			array(
+				'bar_session000000000000000000000', '4', 'user agent', '127.0.0.1',
+				array(
+					array('session_id' => 'anon_session00000000000000000000', 'session_user_id' => 1),
+					array('session_id' => 'bar_session000000000000000000000', 'session_user_id' => 4),
+				),
+				array(),
+				'If a request comes with a valid session id with matching user agent and IP, no new session should be created.',
+			),
+			array(
+				'anon_session00000000000000000000', '4', 'user agent', '127.0.0.1',
+				array(
+					array('session_id' => '__new_session_id__', 'session_user_id' => 1), // use generated SID
+					array('session_id' => 'bar_session000000000000000000000', 'session_user_id' => 4),
+				),
+				array(
+					'u' => array('1', null),
+					'k' => array(null, null),
+					'sid' => array('__new_session_id__', null),
+				),
+				'If a request comes with a valid session id and IP but different user id and user agent, a new anonymous session is created and the session matching the supplied session id is deleted.',
+			),
+		);
+	}
+
+	/**
+	* @dataProvider session_begin_attempts
+	*/
+	public function test_session_begin_valid_session($session_id, $user_id, $user_agent, $ip, $expected_sessions, $expected_cookies, $message)
+	{
+		global $phpbb_container, $phpbb_root_path, $phpEx;
+
+		$db = $this->new_dbal();
+		$config = new phpbb_config(array());
+		$request = $this->getMock('phpbb_request');
+		$user = $this->getMock('phpbb_user');
+
+		$auth_provider = new phpbb_auth_provider_db($db, $config, $request, $user, $phpbb_root_path, $phpEx);
+		$phpbb_container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
+		$phpbb_container->expects($this->any())
+			->method('get')
+			->with('auth.provider.db')
+			->will($this->returnValue($auth_provider));
+
+		$session_factory = new phpbb_session_testable_factory;
+		$session_factory->set_cookies(array(
+			'_sid' => $session_id,
+			'_u' => $user_id,
+		));
+		$session_factory->merge_config_data(array(
+			'session_length' => time(), // need to do this to allow sessions started at time 0
+		));
+		$session_factory->merge_server_data(array(
+			'HTTP_USER_AGENT' => $user_agent,
+			'REMOTE_ADDR' => $ip,
+		));
+
+		$session = $session_factory->get_session($db);
+		$session->page = array('page' => 'page', 'forum' => 0);
+
+		$session->session_begin();
+
+		$sql = 'SELECT session_id, session_user_id
+			FROM phpbb_sessions
+			ORDER BY session_user_id';
+
+		$expected_sessions = $this->replace_session($expected_sessions, $session->session_id);
+		$expected_cookies = $this->replace_session($expected_cookies, $session->session_id);
+
+		$this->assertSqlResultEquals(
+			$expected_sessions,
+			$sql,
+			$message
+		);
+
+		$session->check_cookies($this, $expected_cookies);
+
+		$session_factory->check($this);
+	}
+
+	/**
+	* Replaces recursively the value __new_session_id__ with the given session
+	* id.
+	*
+	* @param array $array An array of data
+	* @param string $session_id The new session id to use instead of the
+	*                           placeholder.
+	* @return array The input array with all occurances of __new_session_id__
+	*               replaced.
+	*/
+	public function replace_session($array, $session_id)
+	{
+		foreach ($array as $key => &$value)
+		{
+			if ($value === '__new_session_id__')
+			{
+				$value = $session_id;
+			}
+
+			if (is_array($value))
+			{
+				$value = $this->replace_session($value, $session_id);
+			}
+		}
+
+		return $array;
+	}
+}
diff --git a/tests/session/continue_test.php b/tests/session/continue_test.php
deleted file mode 100644
index e5a7f7a4a1..0000000000
--- a/tests/session/continue_test.php
+++ /dev/null
@@ -1,133 +0,0 @@
-<?php
-/**
-*
-* @package testing
-* @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-require_once dirname(__FILE__) . '/testable_factory.php';
-
-class phpbb_session_continue_test extends phpbb_database_test_case
-{
-	public function getDataSet()
-	{
-		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/sessions_full.xml');
-	}
-
-	static public function session_begin_attempts()
-	{
-		// The session_id field is defined as CHAR(32) in the database schema.
-		// Thus the data we put in session_id fields has to have a length of 32 characters on stricter DBMSes.
-		// Thus we fill those strings up with zeroes until they have a string length of 32.
-
-		return array(
-			array(
-				'bar_session000000000000000000000', '4', 'user agent', '127.0.0.1',
-				array(
-					array('session_id' => 'anon_session00000000000000000000', 'session_user_id' => 1),
-					array('session_id' => 'bar_session000000000000000000000', 'session_user_id' => 4),
-				),
-				array(),
-				'If a request comes with a valid session id with matching user agent and IP, no new session should be created.',
-			),
-			array(
-				'anon_session00000000000000000000', '4', 'user agent', '127.0.0.1',
-				array(
-					array('session_id' => '__new_session_id__', 'session_user_id' => 1), // use generated SID
-					array('session_id' => 'bar_session000000000000000000000', 'session_user_id' => 4),
-				),
-				array(
-					'u' => array('1', null),
-					'k' => array(null, null),
-					'sid' => array('__new_session_id__', null),
-				),
-				'If a request comes with a valid session id and IP but different user id and user agent, a new anonymous session is created and the session matching the supplied session id is deleted.',
-			),
-		);
-	}
-
-	/**
-	* @dataProvider session_begin_attempts
-	*/
-	public function test_session_begin_valid_session($session_id, $user_id, $user_agent, $ip, $expected_sessions, $expected_cookies, $message)
-	{
-		global $phpbb_container, $phpbb_root_path, $phpEx;
-
-		$db = $this->new_dbal();
-		$config = new phpbb_config(array());
-		$request = $this->getMock('phpbb_request');
-		$user = $this->getMock('phpbb_user');
-
-		$auth_provider = new phpbb_auth_provider_db($db, $config, $request, $user, $phpbb_root_path, $phpEx);
-		$phpbb_container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
-		$phpbb_container->expects($this->any())
-			->method('get')
-			->with('auth.provider.db')
-			->will($this->returnValue($auth_provider));
-
-		$session_factory = new phpbb_session_testable_factory;
-		$session_factory->set_cookies(array(
-			'_sid' => $session_id,
-			'_u' => $user_id,
-		));
-		$session_factory->merge_config_data(array(
-			'session_length' => time(), // need to do this to allow sessions started at time 0
-		));
-		$session_factory->merge_server_data(array(
-			'HTTP_USER_AGENT' => $user_agent,
-			'REMOTE_ADDR' => $ip,
-		));
-
-		$session = $session_factory->get_session($db);
-		$session->page = array('page' => 'page', 'forum' => 0);
-
-		$session->session_begin();
-
-		$sql = 'SELECT session_id, session_user_id
-			FROM phpbb_sessions
-			ORDER BY session_user_id';
-
-		$expected_sessions = $this->replace_session($expected_sessions, $session->session_id);
-		$expected_cookies = $this->replace_session($expected_cookies, $session->session_id);
-
-		$this->assertSqlResultEquals(
-			$expected_sessions,
-			$sql,
-			$message
-		);
-
-		$session->check_cookies($this, $expected_cookies);
-
-		$session_factory->check($this);
-	}
-
-	/**
-	* Replaces recursively the value __new_session_id__ with the given session
-	* id.
-	*
-	* @param array $array An array of data
-	* @param string $session_id The new session id to use instead of the
-	*                           placeholder.
-	* @return array The input array with all occurances of __new_session_id__
-	*               replaced.
-	*/
-	public function replace_session($array, $session_id)
-	{
-		foreach ($array as $key => &$value)
-		{
-			if ($value === '__new_session_id__')
-			{
-				$value = $session_id;
-			}
-
-			if (is_array($value))
-			{
-				$value = $this->replace_session($value, $session_id);
-			}
-		}
-
-		return $array;
-	}
-}
-- 
cgit v1.2.1


From e74abfaa2c25b7c9b4f2f865fbf6800de0761a6b Mon Sep 17 00:00:00 2001
From: Andy Chase <asperous2@gmail.com>
Date: Tue, 25 Jun 2013 12:24:02 -0700
Subject: [ticket/11615] Refactored isvalid test to be more imperative

Refactoring the continue/is_valid test to remove
the confusing data provider work around, while
still keeping redundancies down to a minimum.

PHPBB3-11615
---
 tests/session/check_isvalid_test.php | 120 +++++++++++------------------------
 tests/session/testable_factory.php   |  28 +++++++-
 2 files changed, 63 insertions(+), 85 deletions(-)

diff --git a/tests/session/check_isvalid_test.php b/tests/session/check_isvalid_test.php
index 7cc6f13286..8083e3406a 100644
--- a/tests/session/check_isvalid_test.php
+++ b/tests/session/check_isvalid_test.php
@@ -2,7 +2,7 @@
 /**
 *
 * @package testing
-* @copyright (c) 2011 phpBB Group
+* @copyright (c) 2013 phpBB Group
 * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
@@ -16,42 +16,7 @@ class phpbb_session_check_isvalid_test extends phpbb_database_test_case
 		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/sessions_full.xml');
 	}
 
-	static public function session_begin_attempts()
-	{
-		// The session_id field is defined as CHAR(32) in the database schema.
-		// Thus the data we put in session_id fields has to have a length of 32 characters on stricter DBMSes.
-		// Thus we fill those strings up with zeroes until they have a string length of 32.
-
-		return array(
-			array(
-				'bar_session000000000000000000000', '4', 'user agent', '127.0.0.1',
-				array(
-					array('session_id' => 'anon_session00000000000000000000', 'session_user_id' => 1),
-					array('session_id' => 'bar_session000000000000000000000', 'session_user_id' => 4),
-				),
-				array(),
-				'If a request comes with a valid session id with matching user agent and IP, no new session should be created.',
-			),
-			array(
-				'anon_session00000000000000000000', '4', 'user agent', '127.0.0.1',
-				array(
-					array('session_id' => '__new_session_id__', 'session_user_id' => 1), // use generated SID
-					array('session_id' => 'bar_session000000000000000000000', 'session_user_id' => 4),
-				),
-				array(
-					'u' => array('1', null),
-					'k' => array(null, null),
-					'sid' => array('__new_session_id__', null),
-				),
-				'If a request comes with a valid session id and IP but different user id and user agent, a new anonymous session is created and the session matching the supplied session id is deleted.',
-			),
-		);
-	}
-
-	/**
-	* @dataProvider session_begin_attempts
-	*/
-	public function test_session_begin_valid_session($session_id, $user_id, $user_agent, $ip, $expected_sessions, $expected_cookies, $message)
+	protected function access_with($session_id, $user_id, $user_agent, $ip)
 	{
 		global $phpbb_container, $phpbb_root_path, $phpEx;
 
@@ -68,66 +33,53 @@ class phpbb_session_check_isvalid_test extends phpbb_database_test_case
 			->will($this->returnValue($auth_provider));
 
 		$session_factory = new phpbb_session_testable_factory;
-		$session_factory->set_cookies(array(
-			'_sid' => $session_id,
-			'_u' => $user_id,
-		));
-		$session_factory->merge_config_data(array(
-			'session_length' => time(), // need to do this to allow sessions started at time 0
-		));
-		$session_factory->merge_server_data(array(
-			'HTTP_USER_AGENT' => $user_agent,
-			'REMOTE_ADDR' => $ip,
-		));
+		$session_factory->merge_test_data($session_id, $user_id, $user_agent, $ip);
 
 		$session = $session_factory->get_session($db);
 		$session->page = array('page' => 'page', 'forum' => 0);
 
 		$session->session_begin();
+		$session_factory->check($this);
+		return $session;
+	}
 
+	protected function check_session_equals($expected_sessions, $message)
+	{
 		$sql = 'SELECT session_id, session_user_id
-			FROM phpbb_sessions
-			ORDER BY session_user_id';
-
-		$expected_sessions = $this->replace_session($expected_sessions, $session->session_id);
-		$expected_cookies = $this->replace_session($expected_cookies, $session->session_id);
+				FROM phpbb_sessions
+				ORDER BY session_user_id';
 
-		$this->assertSqlResultEquals(
-			$expected_sessions,
-			$sql,
-			$message
-		);
+		$this->assertSqlResultEquals($expected_sessions, $sql, $message);
+	}
 
-		$session->check_cookies($this, $expected_cookies);
+	public function test_session_valid_session_exists()
+	{
+		$session = $this->access_with('bar_session000000000000000000000', '4', 'user agent', '127.0.0.1');
+		$session->check_cookies($this, array());
 
-		$session_factory->check($this);
+		$this->check_session_equals(array(
+				array('session_id' => 'anon_session00000000000000000000', 'session_user_id' => 1),
+				array('session_id' => 'bar_session000000000000000000000', 'session_user_id' => 4),
+			),
+			'If a request comes with a valid session id with matching user agent and IP, no new session should be created.'
+		);
 	}
 
-	/**
-	* Replaces recursively the value __new_session_id__ with the given session
-	* id.
-	*
-	* @param array $array An array of data
-	* @param string $session_id The new session id to use instead of the
-	*                           placeholder.
-	* @return array The input array with all occurances of __new_session_id__
-	*               replaced.
-	*/
-	public function replace_session($array, $session_id)
+	public function test_session_invalid_make_new_annon_session()
 	{
-		foreach ($array as $key => &$value)
-		{
-			if ($value === '__new_session_id__')
-			{
-				$value = $session_id;
-			}
-
-			if (is_array($value))
-			{
-				$value = $this->replace_session($value, $session_id);
-			}
-		}
+		$session = $this->access_with('anon_session00000000000000000000', '4', 'user agent', '127.0.0.1');
+		$session->check_cookies($this, array(
+			'u' => array('1', null),
+			'k' => array(null, null),
+			'sid' => array($session->session_id, null),
+		));
 
-		return $array;
+		$this->check_session_equals(array(
+				array('session_id' => $session->session_id, 'session_user_id' => 1), // use generated SID
+				array('session_id' => 'bar_session000000000000000000000', 'session_user_id' => 4),
+			),
+			'If a request comes with a valid session id and IP but different user id and user agent,
+				 a new anonymous session is created and the session matching the supplied session id is deleted.'
+		);
 	}
 }
diff --git a/tests/session/testable_factory.php b/tests/session/testable_factory.php
index ace968eb43..8733ce15ef 100644
--- a/tests/session/testable_factory.php
+++ b/tests/session/testable_factory.php
@@ -2,7 +2,7 @@
 /**
 *
 * @package testing
-* @copyright (c) 2011 phpBB Group
+* @copyright (c) 2013 phpBB Group
 * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
@@ -174,6 +174,32 @@ class phpbb_session_testable_factory
 		return $this->server_data = array_merge($this->server_data, $server_data);
 	}
 
+	/**
+	 * Set cookies, merge config and server data in one step.
+	 *
+	 * New values overwrite old ones.
+	 *
+	 * @param $session_id
+	 * @param $user_id
+	 * @param $user_agent
+	 * @param $ip
+	 * @param int $time
+	 */
+	public function merge_test_data($session_id, $user_id, $user_agent, $ip, $time = 0)
+	{
+		$this->set_cookies(array(
+			'_sid' => $session_id,
+			'_u' => $user_id,
+		));
+		$this->merge_config_data(array(
+			'session_length' => time() + $time, // need to do this to allow sessions started at time 0
+		));
+		$this->merge_server_data(array(
+			'HTTP_USER_AGENT' => $user_agent,
+			'REMOTE_ADDR' => $ip,
+		));
+	}
+
 	/**
 	* Retrieve all server variables to be passed to the session.
 	*
-- 
cgit v1.2.1


From 2d850ba7a8f57dd74a23f0feaedf5c5fc409a520 Mon Sep 17 00:00:00 2001
From: asperous <asperous2@gmail.com>
Date: Fri, 12 Jul 2013 11:08:16 -0700
Subject: [ticket/11620]  Refactored check_isvalid_test to use
 session_test_case

Since the continue->isvalid refactoring is now in a branch with the
session_test_case framework, this test can be refactored to use that framework.

PHPBB3-11620
---
 tests/session/check_isvalid_test.php | 26 ++++++--------------------
 1 file changed, 6 insertions(+), 20 deletions(-)

diff --git a/tests/session/check_isvalid_test.php b/tests/session/check_isvalid_test.php
index 8083e3406a..6c21359c7d 100644
--- a/tests/session/check_isvalid_test.php
+++ b/tests/session/check_isvalid_test.php
@@ -7,9 +7,10 @@
 *
 */
 
-require_once dirname(__FILE__) . '/testable_factory.php';
+require_once dirname(__FILE__) . '/../test_framework/phpbb_session_test_case.php';
 
-class phpbb_session_check_isvalid_test extends phpbb_database_test_case
+
+class phpbb_session_check_isvalid_test extends phpbb_session_test_case
 {
 	public function getDataSet()
 	{
@@ -18,28 +19,13 @@ class phpbb_session_check_isvalid_test extends phpbb_database_test_case
 
 	protected function access_with($session_id, $user_id, $user_agent, $ip)
 	{
-		global $phpbb_container, $phpbb_root_path, $phpEx;
-
-		$db = $this->new_dbal();
-		$config = new phpbb_config(array());
-		$request = $this->getMock('phpbb_request');
-		$user = $this->getMock('phpbb_user');
-
-		$auth_provider = new phpbb_auth_provider_db($db, $config, $request, $user, $phpbb_root_path, $phpEx);
-		$phpbb_container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
-		$phpbb_container->expects($this->any())
-			->method('get')
-			->with('auth.provider.db')
-			->will($this->returnValue($auth_provider));
-
-		$session_factory = new phpbb_session_testable_factory;
-		$session_factory->merge_test_data($session_id, $user_id, $user_agent, $ip);
+		$this->session_factory->merge_test_data($session_id, $user_id, $user_agent, $ip);
 
-		$session = $session_factory->get_session($db);
+		$session = $this->session_factory->get_session($this->db);
 		$session->page = array('page' => 'page', 'forum' => 0);
 
 		$session->session_begin();
-		$session_factory->check($this);
+		$this->session_factory->check($this);
 		return $session;
 	}
 
-- 
cgit v1.2.1


From 13e4271c502152b8fa318422d808aabeb97e6c8c Mon Sep 17 00:00:00 2001
From: asperous <asperous2@gmail.com>
Date: Fri, 12 Jul 2013 11:28:17 -0700
Subject: [ticket/11620] Fixed a typo on check_ban_test

PHPBB3-11620
---
 tests/session/check_ban_test.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/session/check_ban_test.php b/tests/session/check_ban_test.php
index ec1f5e3aa1..6795338f23 100644
--- a/tests/session/check_ban_test.php
+++ b/tests/session/check_ban_test.php
@@ -27,7 +27,7 @@ class phpbb_session_check_ban_test extends phpbb_session_test_case
 			array('Matching values in the database, should be banned',
 				 4, '127.0.0.1', 'bar@example.org', true, /* ?: */ true),
 			array('IP Banned, should be banned',
-			     false, '127.1.1.1', false, falseN, /* ?: */ true),
+			     false, '127.1.1.1', false, false, /* ?: */ true),
 		);
 	}
 
-- 
cgit v1.2.1


From af3a4ee33a148c864c30d22a2031cfc7e1b7bcf3 Mon Sep 17 00:00:00 2001
From: asperous <asperous2@gmail.com>
Date: Fri, 12 Jul 2013 13:04:09 -0700
Subject: [ticket/11620] Fixed check_ban_test errors with cache and ban warning
 message

PHPBB3-11620
---
 tests/session/check_ban_test.php | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/tests/session/check_ban_test.php b/tests/session/check_ban_test.php
index 6795338f23..6ff688ee3d 100644
--- a/tests/session/check_ban_test.php
+++ b/tests/session/check_ban_test.php
@@ -38,14 +38,26 @@ class phpbb_session_check_ban_test extends phpbb_session_test_case
 		// Change the global cache object for this test because
 		// the mock cache object does not hit the database as is
 		// needed for this test.
-		global $cache;
-		$old_cache = $cache;
-		$cache = new phpbb_cache_driver_file();
+		global $cache, $config,  $phpbb_root_path, $php_ext;
+		$cache = new phpbb_cache_service(
+			new phpbb_cache_driver_file(),
+			$config,
+			$this->db,
+			$phpbb_root_path,
+			$php_ext
+		);
 
-		$is_banned =
-			$session->check_ban($user_id, $user_ips, $user_email, $return);
+		try
+		{
+			$is_banned =
+				$session->check_ban($user_id, $user_ips, $user_email, $return);
+		} catch (PHPUnit_Framework_Error_Notice $e)
+		{
+			// User error was triggered, user must have been banned
+			$is_banned = true;
+		}
 		$this->assertEquals($should_be_banned, $is_banned, $test_msg);
 
-		$cache = $old_cache;
+		$cache = new phpbb_mock_cache();
 	}
 }
-- 
cgit v1.2.1


From 7dbd85ad02b031fc2392adfd27c66c3725ef117b Mon Sep 17 00:00:00 2001
From: asperous <asperous2@gmail.com>
Date: Fri, 12 Jul 2013 13:04:37 -0700
Subject: [ticket/11620] Added garbage_collection_test

PHPBB3-11620
---
 tests/session/fixtures/sessions_garbage.xml | 58 ++++++++++++++++++++++++++
 tests/session/garbage_collection_test.php   | 63 +++++++++++++++++++++++++++++
 2 files changed, 121 insertions(+)
 create mode 100644 tests/session/fixtures/sessions_garbage.xml
 create mode 100644 tests/session/garbage_collection_test.php

diff --git a/tests/session/fixtures/sessions_garbage.xml b/tests/session/fixtures/sessions_garbage.xml
new file mode 100644
index 0000000000..23c44a975b
--- /dev/null
+++ b/tests/session/fixtures/sessions_garbage.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<dataset>
+	<table name="phpbb_users">
+		<column>user_id</column>
+		<column>username_clean</column>
+		<column>user_permissions</column>
+		<column>user_sig</column>
+		<column>user_occ</column>
+		<column>user_interests</column>
+		<row>
+			<value>4</value>
+			<value>bar</value>
+			<value></value>
+			<value></value>
+			<value></value>
+			<value></value>
+		</row>
+	</table>
+	<table name="phpbb_sessions">
+		<column>session_id</column>
+		<column>session_user_id</column>
+		<column>session_ip</column>
+		<column>session_browser</column>
+		<column>session_admin</column>
+		<row>
+			<value>anon_session00000000000000000000</value>
+			<value>1</value>
+			<value>127.0.0.1</value>
+			<value>anonymous user agent</value>
+			<value>0</value>
+		</row>
+		<row>
+			<value>bar_session000000000000000000000</value>
+			<value>4</value>
+			<value>127.0.0.1</value>
+			<value>user agent</value>
+			<value>1</value>
+		</row>
+	</table>
+	<table name="phpbb_login_attempts">
+		<column>attempt_ip</column>
+		<column>attempt_browser</column>
+		<column>attempt_forwarded_for</column>
+		<column>attempt_time</column>
+		<column>user_id</column>
+		<column>username</column>
+		<column>username_clean</column>
+		<row>
+			<value>127.0.0.1</value>
+			<value>browser</value>
+			<value></value>
+			<value>0001</value>
+			<value>4</value>
+			<value>bar</value>
+			<value>bar</value>
+		</row>
+	</table>
+</dataset>
diff --git a/tests/session/garbage_collection_test.php b/tests/session/garbage_collection_test.php
new file mode 100644
index 0000000000..1b607dfb4f
--- /dev/null
+++ b/tests/session/garbage_collection_test.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ *
+ * @package testing
+ * @copyright (c) 2013 phpBB Group
+ * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+ *
+ */
+
+require_once dirname(__FILE__) . '/../test_framework/phpbb_session_test_case.php';
+
+class phpbb_session_garbage_collection_test extends phpbb_session_test_case
+{
+	public $session;
+
+	public function getDataSet()
+	{
+		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/sessions_garbage.xml');
+	}
+
+	public function setUp()
+	{
+		parent::setUp();
+		$this->session = $this->session_factory->get_session($this->db);
+	}
+
+	protected function assert_sessions_equal($expected, $msg)
+	{
+		$sql = 'SELECT session_id, session_user_id
+				FROM phpbb_sessions
+				ORDER BY session_user_id';
+
+		$this->assertSqlResultEquals($expected, $sql, $msg);
+	}
+
+	public function test_cleanup_all()
+	{
+		$this->assert_sessions_equal(
+			array(
+				array
+				(
+					'session_id' => 'anon_session00000000000000000000',
+					'session_user_id' => 1,
+				),
+				array
+				(
+					'session_id' => 'bar_session000000000000000000000',
+					'session_user_id' => 4,
+				)),
+			'Before test, should have some sessions.'
+		);
+		// Set session length so it clears all
+		global $config;
+		$config['session_length'] = 0;
+		// There is an error unless the captcha plugin is set
+		$config['captcha_plugin'] = 'phpbb_captcha_nogd';
+		$this->session->session_gc();
+		$this->assert_sessions_equal(
+			array(),
+			'After setting session time to 0, should remove all.'
+		);
+	}
+}
-- 
cgit v1.2.1


From 30f198c61a56deb14223a60a8ebf370cc90d9f4b Mon Sep 17 00:00:00 2001
From: asperous <asperous2@gmail.com>
Date: Sat, 13 Jul 2013 07:32:49 -0700
Subject: [ticket/11620] Update auth_provider for new interface

PHPBB3-11620
---
 tests/mock/auth_provider.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tests/mock/auth_provider.php b/tests/mock/auth_provider.php
index 9674c573e3..e0a2abd2d5 100644
--- a/tests/mock/auth_provider.php
+++ b/tests/mock/auth_provider.php
@@ -31,7 +31,7 @@ class phpbb_mock_auth_provider implements phpbb_auth_provider_interface
 		return array();
 	}
 
-	function acp($new)
+	function acp()
 	{
 		return array();
 	}
@@ -45,4 +45,9 @@ class phpbb_mock_auth_provider implements phpbb_auth_provider_interface
 	{
 		return null;
 	}
+
+	public function get_acp_template($new_config)
+	{
+		return null;
+	}
 }
-- 
cgit v1.2.1


From 25b189d33bbf2b94da6f9f969e8d91ade8eba30a Mon Sep 17 00:00:00 2001
From: asperous <asperous2@gmail.com>
Date: Sat, 13 Jul 2013 08:26:46 -0700
Subject: [ticket/11620] Cleanup creation_test that was renamed on a
 cherry-pick

PHPBB3-11620
---
 tests/session/creation_test.php | 69 -----------------------------------------
 1 file changed, 69 deletions(-)
 delete mode 100644 tests/session/creation_test.php

diff --git a/tests/session/creation_test.php b/tests/session/creation_test.php
deleted file mode 100644
index fde76d6b06..0000000000
--- a/tests/session/creation_test.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-/**
-*
-* @package testing
-* @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-require_once dirname(__FILE__) . '/testable_factory.php';
-
-class phpbb_session_creation_test extends phpbb_database_test_case
-{
-	public function getDataSet()
-	{
-		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/sessions_empty.xml');
-	}
-
-	// also see security/extract_current_page.php
-
-	public function test_login_session_create()
-	{
-		global $phpbb_container, $phpbb_root_path, $phpEx;
-
-		$db = $this->new_dbal();
-		$config = new phpbb_config(array());
-		$request = $this->getMock('phpbb_request');
-		$user = $this->getMock('phpbb_user');
-
-		$auth_provider = new phpbb_auth_provider_db($db, $config, $request, $user, $phpbb_root_path, $phpEx);
-		$phpbb_container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
-		$phpbb_container->expects($this->any())
-			->method('get')
-			->with('auth.provider.db')
-			->will($this->returnValue($auth_provider));
-
-		$session_factory = new phpbb_session_testable_factory;
-
-		$session = $session_factory->get_session($db);
-		$session->page = array('page' => 'page', 'forum' => 0);
-
-		$session->session_create(3);
-
-		$sql = 'SELECT session_user_id
-			FROM phpbb_sessions';
-
-		$this->assertSqlResultEquals(
-			array(array('session_user_id' => 3)),
-			$sql,
-			'Check if exactly one session for user id 3 was created'
-		);
-
-		$one_year_in_seconds = 365 * 24 * 60 * 60;
-		$cookie_expire = $session->time_now + $one_year_in_seconds;
-
-		$session->check_cookies($this, array(
-			'u' => array(null, $cookie_expire),
-			'k' => array(null, $cookie_expire),
-			'sid' => array($session->session_id, $cookie_expire),
-		));
-
-		global $SID, $_SID;
-		$this->assertEquals($session->session_id, $_SID);
-		$this->assertEquals('?sid=' . $session->session_id, $SID);
-
-		$session_factory->check($this);
-	}
-}
-
-- 
cgit v1.2.1


From de2cb595336ee49aeb4bab4ee857fbe71e249599 Mon Sep 17 00:00:00 2001
From: asperous <asperous2@gmail.com>
Date: Sat, 13 Jul 2013 08:38:02 -0700
Subject: [ticket/11620] Fix a static calls to non-static for session captcha

These changes fixes an error in certain version of php that throws
an error if you call a non-static method statically.

PHPBB3-11620
---
 phpBB/includes/captcha/captcha_factory.php | 3 ++-
 phpBB/includes/session.php                 | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/phpBB/includes/captcha/captcha_factory.php b/phpBB/includes/captcha/captcha_factory.php
index 1ed8e119b5..af79f059fe 100644
--- a/phpBB/includes/captcha/captcha_factory.php
+++ b/phpBB/includes/captcha/captcha_factory.php
@@ -50,7 +50,8 @@ class phpbb_captcha_factory
 		{
 			include($phpbb_root_path . "includes/captcha/plugins/{$name}_plugin." . $phpEx);
 		}
-		call_user_func(array($name, 'garbage_collect'), 0);
+		$captcha = new $name;
+		$captcha->garbage_collect('');
 	}
 
 	/**
diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php
index 66bf053f7d..392a55e48f 100644
--- a/phpBB/includes/session.php
+++ b/phpBB/includes/session.php
@@ -1016,7 +1016,8 @@ class phpbb_session
 			{
 				include($phpbb_root_path . "includes/captcha/captcha_factory." . $phpEx);
 			}
-			phpbb_captcha_factory::garbage_collect($config['captcha_plugin']);
+			$captcha_factory = new phpbb_captcha_factory();
+			$captcha_factory->garbage_collect($config['captcha_plugin']);
 
 			$sql = 'DELETE FROM ' . LOGIN_ATTEMPT_TABLE . '
 				WHERE attempt_time < ' . (time() - (int) $config['ip_login_limit_time']);
-- 
cgit v1.2.1


From cc1aef47fb4f5d37415436c62067ad2dcde768bb Mon Sep 17 00:00:00 2001
From: Andy Chase <asperous2@gmail.com>
Date: Mon, 22 Jul 2013 11:13:31 -0700
Subject: [ticket/11620] Changes for code guidelines consistency

PHPBB3-11620
---
 tests/session/extract_page_test.php      | 20 ++++++++++----------
 tests/session/testable_facade.php        |  3 ++-
 tests/session/validate_referrer_test.php |  5 +++--
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/tests/session/extract_page_test.php b/tests/session/extract_page_test.php
index 9346973bc4..4dbbbc9c59 100644
--- a/tests/session/extract_page_test.php
+++ b/tests/session/extract_page_test.php
@@ -32,8 +32,8 @@ class phpbb_session_extract_page_test extends phpbb_session_test_case
 					'root_script_path' => '/phpBB/',
 					'page' => 'index.php',
 					'forum' => 0,
-				)
-			) ,
+				),
+			),
 			array(
 				'./',
 				'/phpBB/ucp.php',
@@ -47,8 +47,8 @@ class phpbb_session_extract_page_test extends phpbb_session_test_case
 					'root_script_path' => '/phpBB/',
 					'page' => 'ucp.php?mode=login',
 					'forum' => 0,
-				)
-			) ,
+				),
+			),
 			array(
 				'./',
 				'/phpBB/ucp.php',
@@ -62,8 +62,8 @@ class phpbb_session_extract_page_test extends phpbb_session_test_case
 					'root_script_path' => '/phpBB/',
 					'page' => 'ucp.php?mode=register',
 					'forum' => 0,
-				)
-			) ,
+				),
+			),
 			array(
 				'./',
 				'/phpBB/ucp.php',
@@ -77,8 +77,8 @@ class phpbb_session_extract_page_test extends phpbb_session_test_case
 					'root_script_path' => '/phpBB/',
 					'page' => 'ucp.php?mode=register',
 					'forum' => 0,
-				)
-			) ,
+				),
+			),
 			array(
 				'./../',
 				'/phpBB/adm/index.php',
@@ -93,8 +93,8 @@ class phpbb_session_extract_page_test extends phpbb_session_test_case
 					'root_script_path' => '/phpBB/',
 					//'page' => 'adm/index.php',
 					'forum' => 0,
-				)
-			)
+				),
+			),
 		);
 	}
 
diff --git a/tests/session/testable_facade.php b/tests/session/testable_facade.php
index 1cb1c94b52..1343b34a79 100644
--- a/tests/session/testable_facade.php
+++ b/tests/session/testable_facade.php
@@ -27,7 +27,8 @@ class phpbb_session_testable_facade
 	protected $db;
 	protected $session_factory;
 
-	function __construct($db, $session_factory) {
+	function __construct($db, $session_factory)
+	{
 		$this->db = $db;
 		$this->session_factory = $session_factory;
 	}
diff --git a/tests/session/validate_referrer_test.php b/tests/session/validate_referrer_test.php
index f91ac5f1f9..b517b668ac 100644
--- a/tests/session/validate_referrer_test.php
+++ b/tests/session/validate_referrer_test.php
@@ -52,7 +52,7 @@ class phpbb_session_validate_referrer_test extends phpbb_session_test_case
 	)
 	{
 		// Referrer needs http:// because it's going to get stripped in function.
-		$referrer = $referrer ? 'http://'.$referrer : '';
+		$referrer = $referrer ? 'http://' . $referrer : '';
 		$this->assertEquals(
 			$pass_or_fail,
 			$this->session_facade->validate_referer(
@@ -63,6 +63,7 @@ class phpbb_session_validate_referrer_test extends phpbb_session_test_case
 				$server_port,
 				$server_name,
 				$root_script_path
-		), "referrer should" . ($pass_or_fail? '' : "n't") . " be validated");
+			),
+			"referrer should" . ($pass_or_fail ? '' : "n't") . " be validated");
 	}
 }
-- 
cgit v1.2.1


From 28e98466d959875d2f5b0e917c32783c1039dc23 Mon Sep 17 00:00:00 2001
From: Andy Chase <asperous2@gmail.com>
Date: Mon, 22 Jul 2013 12:26:02 -0700
Subject: [ticket/11620] Changes to match merge

PHPBB3-11620
---
 tests/session/fixtures/sessions_full.xml | 3 +++
 tests/session/testable_facade.php        | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/tests/session/fixtures/sessions_full.xml b/tests/session/fixtures/sessions_full.xml
index 509687f4d2..6bbaf1c9d5 100644
--- a/tests/session/fixtures/sessions_full.xml
+++ b/tests/session/fixtures/sessions_full.xml
@@ -37,17 +37,20 @@
 		<column>session_user_id</column>
 		<column>session_ip</column>
 		<column>session_browser</column>
+		<column>session_admin</column>
 		<row>
 			<value>anon_session00000000000000000000</value>
 			<value>1</value>
 			<value>127.0.0.1</value>
 			<value>anonymous user agent</value>
+			<value>0</value>
 		</row>
 		<row>
 			<value>bar_session000000000000000000000</value>
 			<value>4</value>
 			<value>127.0.0.1</value>
 			<value>user agent</value>
+			<value>1</value>
 		</row>
 	</table>
 </dataset>
diff --git a/tests/session/testable_facade.php b/tests/session/testable_facade.php
index 1343b34a79..c5e58fce05 100644
--- a/tests/session/testable_facade.php
+++ b/tests/session/testable_facade.php
@@ -8,7 +8,7 @@
  */
 
 require_once dirname(__FILE__) . '/testable_factory.php';
-require_once dirname(__FILE__) . '/../../phpBB/includes/session.php';
+require_once dirname(__FILE__) . '/../../phpBB/phpbb/session.php';
 
 /**
  * This class exists to expose session.php's functions in a more testable way.
-- 
cgit v1.2.1


From 974da6449c2f18f52086bd5ee6d24aafed046e37 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Mon, 22 Jul 2013 22:00:27 +0200
Subject: [ticket/11723] Correctly redirect user to agreement page and let him
 leave

This patch consists of two changes. The first one will make sure that $agree
is correctly reset to 0 and the user redirected back to the agreement page
after changing the display language. Secondly, by reseting 'change_lang',
the user will be able to agree to the terms on the agreement page again.
The changed language will still be kept, as this is correctly saved in the
'lang' field that is passed to the ucp_register page.
The variable $agree has also been changed to be boolean. It is not used as
an integer anywere in the ucp_register file.

PHPBB3-11723
---
 phpBB/includes/ucp/ucp_register.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php
index 70fbfe46fb..7bc7ac8191 100644
--- a/phpBB/includes/ucp/ucp_register.php
+++ b/phpBB/includes/ucp/ucp_register.php
@@ -38,7 +38,7 @@ class ucp_register
 		include($phpbb_root_path . 'includes/functions_profile_fields.' . $phpEx);
 
 		$coppa			= $request->is_set('coppa') ? (int) $request->variable('coppa', false) : false;
-		$agreed			= (int) $request->variable('agreed', false);
+		$agreed			= $request->variable('agreed', false);
 		$submit			= $request->is_set_post('submit');
 		$change_lang	= request_var('change_lang', '');
 		$user_lang		= request_var('lang', $user->lang_name);
@@ -63,7 +63,7 @@ class ucp_register
 					$submit = false;
 
 					// Setting back agreed to let the user view the agreement in his/her language
-					$agreed = ($request->variable('change_lang', false)) ? 0 : $agreed;
+					$agreed = false;
 				}
 
 				$user->lang_name = $user_lang = $use_lang;
@@ -89,7 +89,7 @@ class ucp_register
 			$add_coppa = ($coppa !== false) ? '&amp;coppa=' . $coppa : '';
 
 			$s_hidden_fields = array(
-				'change_lang'	=> $change_lang,
+				'change_lang'	=> '',
 			);
 
 			// If we change the language, we want to pass on some more possible parameter.
-- 
cgit v1.2.1


From 9dbd42e9452fe8459de905170f9031a4515cc0b2 Mon Sep 17 00:00:00 2001
From: Andy Chase <asperous2@gmail.com>
Date: Mon, 22 Jul 2013 13:51:06 -0700
Subject: [ticket/11620] Space between . in directory import concatenation

PHPBB3-11620
---
 tests/session/check_ban_test.php          | 2 +-
 tests/session/check_isvalid_test.php      | 2 +-
 tests/session/create_test.php             | 2 +-
 tests/session/extract_hostname_test.php   | 2 +-
 tests/session/extract_page_test.php       | 2 +-
 tests/session/garbage_collection_test.php | 2 +-
 tests/session/session_key_test.php        | 2 +-
 tests/session/unset_admin_test.php        | 2 +-
 tests/session/validate_referrer_test.php  | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/tests/session/check_ban_test.php b/tests/session/check_ban_test.php
index 6ff688ee3d..dfe971ea27 100644
--- a/tests/session/check_ban_test.php
+++ b/tests/session/check_ban_test.php
@@ -16,7 +16,7 @@ class phpbb_session_check_ban_test extends phpbb_session_test_case
 
 	public function getDataSet()
 	{
-		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/sessions_banlist.xml');
+		return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/sessions_banlist.xml');
 	}
 
 	static function check_banned_data()
diff --git a/tests/session/check_isvalid_test.php b/tests/session/check_isvalid_test.php
index 6c21359c7d..24dce7c9c4 100644
--- a/tests/session/check_isvalid_test.php
+++ b/tests/session/check_isvalid_test.php
@@ -14,7 +14,7 @@ class phpbb_session_check_isvalid_test extends phpbb_session_test_case
 {
 	public function getDataSet()
 	{
-		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/sessions_full.xml');
+		return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/sessions_full.xml');
 	}
 
 	protected function access_with($session_id, $user_id, $user_agent, $ip)
diff --git a/tests/session/create_test.php b/tests/session/create_test.php
index a8248ae62c..64140f9883 100644
--- a/tests/session/create_test.php
+++ b/tests/session/create_test.php
@@ -13,7 +13,7 @@ class phpbb_session_create_test extends phpbb_session_test_case
 {
 	public function getDataSet()
 	{
-		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/sessions_full.xml');
+		return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/sessions_full.xml');
 	}
 
 	static function bot($bot_agent, $user_id, $bot_ip)
diff --git a/tests/session/extract_hostname_test.php b/tests/session/extract_hostname_test.php
index 5ff43cbb60..bd183fd438 100644
--- a/tests/session/extract_hostname_test.php
+++ b/tests/session/extract_hostname_test.php
@@ -13,7 +13,7 @@ class phpbb_session_extract_hostname_test extends phpbb_session_test_case
 {
 	public function getDataSet()
 	{
-		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/sessions_empty.xml');
+		return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/sessions_empty.xml');
 	}
 
 	static public function extract_current_hostname_data()
diff --git a/tests/session/extract_page_test.php b/tests/session/extract_page_test.php
index 4dbbbc9c59..f4ae8de021 100644
--- a/tests/session/extract_page_test.php
+++ b/tests/session/extract_page_test.php
@@ -13,7 +13,7 @@ class phpbb_session_extract_page_test extends phpbb_session_test_case
 {
 	public function getDataSet()
 	{
-		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/sessions_empty.xml');
+		return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/sessions_empty.xml');
 	}
 
 	static public function extract_current_page_data()
diff --git a/tests/session/garbage_collection_test.php b/tests/session/garbage_collection_test.php
index 1b607dfb4f..b1be958d62 100644
--- a/tests/session/garbage_collection_test.php
+++ b/tests/session/garbage_collection_test.php
@@ -15,7 +15,7 @@ class phpbb_session_garbage_collection_test extends phpbb_session_test_case
 
 	public function getDataSet()
 	{
-		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/sessions_garbage.xml');
+		return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/sessions_garbage.xml');
 	}
 
 	public function setUp()
diff --git a/tests/session/session_key_test.php b/tests/session/session_key_test.php
index 6406742168..1cf2101385 100644
--- a/tests/session/session_key_test.php
+++ b/tests/session/session_key_test.php
@@ -16,7 +16,7 @@ class phpbb_session_login_keys_test extends phpbb_session_test_case
 
 	public function getDataSet()
 	{
-		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/sessions_key.xml');
+		return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/sessions_key.xml');
 	}
 
 	public function test_set_key_manually()
diff --git a/tests/session/unset_admin_test.php b/tests/session/unset_admin_test.php
index bbb5eb1439..1d5b1759ab 100644
--- a/tests/session/unset_admin_test.php
+++ b/tests/session/unset_admin_test.php
@@ -13,7 +13,7 @@ class phpbb_session_unset_admin_test extends phpbb_session_test_case
 {
 	public function getDataSet()
 	{
-		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/sessions_full.xml');
+		return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/sessions_full.xml');
 	}
 
 	function get_test_session()
diff --git a/tests/session/validate_referrer_test.php b/tests/session/validate_referrer_test.php
index b517b668ac..f78bf36c1b 100644
--- a/tests/session/validate_referrer_test.php
+++ b/tests/session/validate_referrer_test.php
@@ -13,7 +13,7 @@ class phpbb_session_validate_referrer_test extends phpbb_session_test_case
 {
 	public function getDataSet()
 	{
-		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/sessions_empty.xml');
+		return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/sessions_empty.xml');
 	}
 
 	static function referrer_inputs() {
-- 
cgit v1.2.1


From 9d38ded22875e023d4391e7724673087f87fa481 Mon Sep 17 00:00:00 2001
From: Andy Chase <asperous2@gmail.com>
Date: Mon, 22 Jul 2013 13:52:17 -0700
Subject: [ticket/11620] Expected and actual test conditions wrongly swapped

PHPBB3-11620
---
 tests/session/create_test.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/session/create_test.php b/tests/session/create_test.php
index 64140f9883..0faedf4db2 100644
--- a/tests/session/create_test.php
+++ b/tests/session/create_test.php
@@ -38,6 +38,6 @@ class phpbb_session_create_test extends phpbb_session_test_case
 			self::bot('user agent', 13, '127.0.0.1'),
 			''
 		);
-		$this->assertEquals($output->data['is_bot'], true, 'should be a bot');
+		$this->assertEquals(true, $output->data['is_bot'] , 'should be a bot');
 	}
 }
-- 
cgit v1.2.1


From aa77367267d381f1f87f1ed725e4f5f4a3135922 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 22 Jul 2013 22:54:55 +0200
Subject: [ticket/11728] Replace topic_approved with topic_visibility

PHPBB3-11728
---
 phpBB/phpbb/feed/topic.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/phpbb/feed/topic.php b/phpBB/phpbb/feed/topic.php
index 696b0f5a52..bb1753d823 100644
--- a/phpBB/phpbb/feed/topic.php
+++ b/phpBB/phpbb/feed/topic.php
@@ -60,7 +60,7 @@ class phpbb_feed_topic extends phpbb_feed_post_base
 		$this->forum_id = (int) $this->topic_data['forum_id'];
 
 		// Make sure topic is either approved or user authed
-		if (!$this->topic_data['topic_approved'] && !$this->auth->acl_get('m_approve', $this->forum_id))
+		if ($this->topic_data['topic_visibility'] != ITEM_APPROVED && !$this->auth->acl_get('m_approve', $this->forum_id))
 		{
 			trigger_error('SORRY_AUTH_READ');
 		}
-- 
cgit v1.2.1


From 80f81dd0d2d4aaef0b9c770d6071526aaca79e06 Mon Sep 17 00:00:00 2001
From: Andy Chase <asperous2@gmail.com>
Date: Mon, 22 Jul 2013 15:04:30 -0700
Subject: [ticket/11731] Remove static calls to captcha garbage collector

PHPBB3-11731
---
 phpBB/includes/captcha/captcha_factory.php | 3 ++-
 phpBB/phpbb/session.php                    | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/phpBB/includes/captcha/captcha_factory.php b/phpBB/includes/captcha/captcha_factory.php
index 1ed8e119b5..fac45087e3 100644
--- a/phpBB/includes/captcha/captcha_factory.php
+++ b/phpBB/includes/captcha/captcha_factory.php
@@ -50,7 +50,8 @@ class phpbb_captcha_factory
 		{
 			include($phpbb_root_path . "includes/captcha/plugins/{$name}_plugin." . $phpEx);
 		}
-		call_user_func(array($name, 'garbage_collect'), 0);
+		$captcha = self::get_instance($name);
+		$captcha->garbage_collect(0);
 	}
 
 	/**
diff --git a/phpBB/phpbb/session.php b/phpBB/phpbb/session.php
index e0585b1523..dc33786666 100644
--- a/phpBB/phpbb/session.php
+++ b/phpBB/phpbb/session.php
@@ -1022,7 +1022,8 @@ class phpbb_session
 			{
 				include($phpbb_root_path . "includes/captcha/captcha_factory." . $phpEx);
 			}
-			phpbb_captcha_factory::garbage_collect($config['captcha_plugin']);
+			$captcha_factory = new phpbb_captcha_factory();
+			$captcha_factory->garbage_collect($config['captcha_plugin']);
 
 			$sql = 'DELETE FROM ' . LOGIN_ATTEMPT_TABLE . '
 				WHERE attempt_time < ' . (time() - (int) $config['ip_login_limit_time']);
-- 
cgit v1.2.1


From 8dc8ee205a30e4f1813f2b85e0176cc47100f47b Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 23 Jul 2013 00:58:03 +0200
Subject: [ticket/11733] Add browse test for feed.php

PHPBB3-11733
---
 tests/functional/browse_test.php                    |  7 +++++++
 tests/test_framework/phpbb_functional_test_case.php | 21 +++++++++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/tests/functional/browse_test.php b/tests/functional/browse_test.php
index 18a2ad9464..c3be301762 100644
--- a/tests/functional/browse_test.php
+++ b/tests/functional/browse_test.php
@@ -29,4 +29,11 @@ class phpbb_functional_browse_test extends phpbb_functional_test_case
 		$crawler = self::request('GET', 'viewtopic.php?t=1');
 		$this->assertGreaterThan(0, $crawler->filter('.postbody')->count());
 	}
+
+	public function test_feed()
+	{
+		$crawler = self::request('GET', 'feed.php', array(), false);
+		self::assert_response_xml();
+		$this->assertGreaterThan(0, $crawler->filter('entry')->count());
+	}
 }
diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php
index ed307c3ce2..de3611c4cc 100644
--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -747,6 +747,27 @@ class phpbb_functional_test_case extends phpbb_test_case
 		self::assertStringStartsWith('<!DOCTYPE', trim($content), 'Output found before DOCTYPE specification.');
 	}
 
+	/*
+	* Perform some basic assertions for an xml page
+	*
+	* Checks for debug/error output before the actual page content and the status code
+	*
+	* @param mixed $status_code		Expected status code, false to disable check
+	* @return null
+	*/
+	static public function assert_response_xml($status_code = 200)
+	{
+		if ($status_code !== false)
+		{
+			self::assert_response_status_code($status_code);
+		}
+
+		// Any output before the xml opening means there was an error
+		$content = self::$client->getResponse()->getContent();
+		self::assertNotContains('[phpBB Debug]', $content);
+		self::assertStringStartsWith('<?xml', trim($content), 'Output found before XML specification.');
+	}
+
 	/**
 	* Heuristic function to check that the response is success.
 	*
-- 
cgit v1.2.1


From 10ba1e73da8be9920708593592ab47493de4b101 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 23 Jul 2013 00:59:51 +0200
Subject: [ticket/11733] Fix "Illegal offset type" Warning caused by overall
 feed

PHPBB3-11733
---
 phpBB/phpbb/feed/overall.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/phpbb/feed/overall.php b/phpBB/phpbb/feed/overall.php
index 869df7cde0..224d97ec03 100644
--- a/phpBB/phpbb/feed/overall.php
+++ b/phpBB/phpbb/feed/overall.php
@@ -72,7 +72,7 @@ class phpbb_feed_overall extends phpbb_feed_post_base
 				),
 			),
 			'WHERE'		=> $this->db->sql_in_set('p.topic_id', $topic_ids) . '
-							AND ' . $this->content_visibility->get_visibility_sql('post', array(), 'p.') . '
+							AND ' . $this->content_visibility->get_forums_visibility_sql('post', $forum_ids, 'p.') . '
 							AND p.post_time >= ' . $min_post_time . '
 							AND u.user_id = p.poster_id',
 			'ORDER_BY'	=> 'p.post_time DESC',
-- 
cgit v1.2.1


From cc6147f8769b7d70c9c48257c787ff00552beaf4 Mon Sep 17 00:00:00 2001
From: Andy Chase <asperous2@gmail.com>
Date: Mon, 22 Jul 2013 15:41:51 -0700
Subject: [ticket/11620] Minor indentation changes and comment clarity

PHPBB3-11620
---
 tests/session/check_ban_test.php     | 11 +++++------
 tests/session/check_isvalid_test.php |  1 -
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/tests/session/check_ban_test.php b/tests/session/check_ban_test.php
index dfe971ea27..303751f54c 100644
--- a/tests/session/check_ban_test.php
+++ b/tests/session/check_ban_test.php
@@ -23,11 +23,11 @@ class phpbb_session_check_ban_test extends phpbb_session_test_case
 	{
 		return array(
 		    array('All false values, should not be banned',
-				 false, false, false, false, /* ?: */ false),
+				 false, false, false, false, /* should be banned? -> */ false),
 			array('Matching values in the database, should be banned',
-				 4, '127.0.0.1', 'bar@example.org', true, /* ?: */ true),
+				 4, '127.0.0.1', 'bar@example.org', true, /* should be banned? -> */ true),
 			array('IP Banned, should be banned',
-			     false, '127.1.1.1', false, false, /* ?: */ true),
+			     false, '127.1.1.1', false, false, /* should be banned? -> */ true),
 		);
 	}
 
@@ -38,7 +38,7 @@ class phpbb_session_check_ban_test extends phpbb_session_test_case
 		// Change the global cache object for this test because
 		// the mock cache object does not hit the database as is
 		// needed for this test.
-		global $cache, $config,  $phpbb_root_path, $php_ext;
+		global $cache, $config, $phpbb_root_path, $php_ext;
 		$cache = new phpbb_cache_service(
 			new phpbb_cache_driver_file(),
 			$config,
@@ -49,8 +49,7 @@ class phpbb_session_check_ban_test extends phpbb_session_test_case
 
 		try
 		{
-			$is_banned =
-				$session->check_ban($user_id, $user_ips, $user_email, $return);
+			$is_banned = $session->check_ban($user_id, $user_ips, $user_email, $return);
 		} catch (PHPUnit_Framework_Error_Notice $e)
 		{
 			// User error was triggered, user must have been banned
diff --git a/tests/session/check_isvalid_test.php b/tests/session/check_isvalid_test.php
index 24dce7c9c4..c60770dad8 100644
--- a/tests/session/check_isvalid_test.php
+++ b/tests/session/check_isvalid_test.php
@@ -9,7 +9,6 @@
 
 require_once dirname(__FILE__) . '/../test_framework/phpbb_session_test_case.php';
 
-
 class phpbb_session_check_isvalid_test extends phpbb_session_test_case
 {
 	public function getDataSet()
-- 
cgit v1.2.1


From 568de3b8ceb68c4d988a7e69b0d357bd43bdd25b Mon Sep 17 00:00:00 2001
From: Andy Chase <asperous2@gmail.com>
Date: Mon, 22 Jul 2013 15:44:22 -0700
Subject: [ticket/11620] Changed incorrect global variable

PHPBB3-11620
---
 tests/session/check_ban_test.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/session/check_ban_test.php b/tests/session/check_ban_test.php
index 303751f54c..fe7c70575a 100644
--- a/tests/session/check_ban_test.php
+++ b/tests/session/check_ban_test.php
@@ -38,13 +38,13 @@ class phpbb_session_check_ban_test extends phpbb_session_test_case
 		// Change the global cache object for this test because
 		// the mock cache object does not hit the database as is
 		// needed for this test.
-		global $cache, $config, $phpbb_root_path, $php_ext;
+		global $cache, $config, $phpbb_root_path, $phpEx;
 		$cache = new phpbb_cache_service(
 			new phpbb_cache_driver_file(),
 			$config,
 			$this->db,
 			$phpbb_root_path,
-			$php_ext
+			$phpEx
 		);
 
 		try
-- 
cgit v1.2.1


From 0c54fb034b71cfc2bff338430acb1e2b43083dd5 Mon Sep 17 00:00:00 2001
From: Andy Chase <asperous2@gmail.com>
Date: Mon, 22 Jul 2013 17:39:14 -0700
Subject: [ticket/11620] Move check_ban_test functions to setUp/tearDown for
 clarity

PHPBB3-11620
---
 tests/session/check_ban_test.php | 36 ++++++++++++++++++++++++++----------
 1 file changed, 26 insertions(+), 10 deletions(-)

diff --git a/tests/session/check_ban_test.php b/tests/session/check_ban_test.php
index fe7c70575a..8d6c9a866d 100644
--- a/tests/session/check_ban_test.php
+++ b/tests/session/check_ban_test.php
@@ -13,6 +13,8 @@ class phpbb_session_check_ban_test extends phpbb_session_test_case
 {
 	protected $user_id = 4;
 	protected $key_id = 4;
+	protected $session;
+	protected $backup_cache;
 
 	public function getDataSet()
 	{
@@ -31,14 +33,16 @@ class phpbb_session_check_ban_test extends phpbb_session_test_case
 		);
 	}
 
-	/** @dataProvider check_banned_data */
-	public function test_check_is_banned($test_msg, $user_id, $user_ips, $user_email, $return, $should_be_banned)
+	public function setUp()
 	{
-		$session = $this->session_factory->get_session($this->db);
-		// Change the global cache object for this test because
-		// the mock cache object does not hit the database as is
-		// needed for this test.
+		parent::setUp();
+		// Get session here so that config is mocked correctly
+		$this->session = $this->session_factory->get_session($this->db);
 		global $cache, $config, $phpbb_root_path, $phpEx;
+		$this->backup_cache = $cache;
+		// Change the global cache object for this test because
+		// the mock cache object does not hit the database as is needed
+		// for this test.
 		$cache = new phpbb_cache_service(
 			new phpbb_cache_driver_file(),
 			$config,
@@ -46,17 +50,29 @@ class phpbb_session_check_ban_test extends phpbb_session_test_case
 			$phpbb_root_path,
 			$phpEx
 		);
+	}
+
+	public function tearDown()
+	{
+		parent::tearDown();
+		// Set cache back to what it was before the test changed it
+		global $cache;
+		$cache = $this->backup_cache;
+	}
 
+	/** @dataProvider check_banned_data */
+	public function test_check_is_banned($test_msg, $user_id, $user_ips, $user_email, $return, $should_be_banned)
+	{
 		try
 		{
-			$is_banned = $session->check_ban($user_id, $user_ips, $user_email, $return);
-		} catch (PHPUnit_Framework_Error_Notice $e)
+			$is_banned = $this->session->check_ban($user_id, $user_ips, $user_email, $return);
+		}
+		catch (PHPUnit_Framework_Error_Notice $e)
 		{
 			// User error was triggered, user must have been banned
 			$is_banned = true;
 		}
-		$this->assertEquals($should_be_banned, $is_banned, $test_msg);
 
-		$cache = new phpbb_mock_cache();
+		$this->assertEquals($should_be_banned, $is_banned, $test_msg);
 	}
 }
-- 
cgit v1.2.1


From 2fe2724e684304e1c8323c047d1dde6cd732afcd Mon Sep 17 00:00:00 2001
From: Andy Chase <asperous2@gmail.com>
Date: Mon, 22 Jul 2013 17:39:45 -0700
Subject: [ticket/11620] Whitespace and combine function into test_case

PHPBB3-11620
---
 tests/mock/auth_provider.php                     |  8 ++++----
 tests/session/check_isvalid_test.php             | 13 ++-----------
 tests/session/create_test.php                    |  2 +-
 tests/session/garbage_collection_test.php        | 22 ++++++----------------
 tests/session/testable_facade.php                |  8 ++++----
 tests/session/validate_referrer_test.php         |  7 ++++---
 tests/test_framework/phpbb_session_test_case.php |  9 +++++++++
 7 files changed, 30 insertions(+), 39 deletions(-)

diff --git a/tests/mock/auth_provider.php b/tests/mock/auth_provider.php
index e0a2abd2d5..9d002334d6 100644
--- a/tests/mock/auth_provider.php
+++ b/tests/mock/auth_provider.php
@@ -20,10 +20,10 @@ class phpbb_mock_auth_provider implements phpbb_auth_provider_interface
 	function login($username, $password)
 	{
 		return array(
-			 'status' => "",
-			 'error_msg' => "",
-			 'user_row' => "",
-			);
+			'status' => "",
+			'error_msg' => "",
+			'user_row' => "",
+		);
 	}
 
 	function autologin()
diff --git a/tests/session/check_isvalid_test.php b/tests/session/check_isvalid_test.php
index c60770dad8..760e2a6f24 100644
--- a/tests/session/check_isvalid_test.php
+++ b/tests/session/check_isvalid_test.php
@@ -28,21 +28,12 @@ class phpbb_session_check_isvalid_test extends phpbb_session_test_case
 		return $session;
 	}
 
-	protected function check_session_equals($expected_sessions, $message)
-	{
-		$sql = 'SELECT session_id, session_user_id
-				FROM phpbb_sessions
-				ORDER BY session_user_id';
-
-		$this->assertSqlResultEquals($expected_sessions, $sql, $message);
-	}
-
 	public function test_session_valid_session_exists()
 	{
 		$session = $this->access_with('bar_session000000000000000000000', '4', 'user agent', '127.0.0.1');
 		$session->check_cookies($this, array());
 
-		$this->check_session_equals(array(
+		$this->check_sessions_equals(array(
 				array('session_id' => 'anon_session00000000000000000000', 'session_user_id' => 1),
 				array('session_id' => 'bar_session000000000000000000000', 'session_user_id' => 4),
 			),
@@ -59,7 +50,7 @@ class phpbb_session_check_isvalid_test extends phpbb_session_test_case
 			'sid' => array($session->session_id, null),
 		));
 
-		$this->check_session_equals(array(
+		$this->check_sessions_equals(array(
 				array('session_id' => $session->session_id, 'session_user_id' => 1), // use generated SID
 				array('session_id' => 'bar_session000000000000000000000', 'session_user_id' => 4),
 			),
diff --git a/tests/session/create_test.php b/tests/session/create_test.php
index 0faedf4db2..442445599b 100644
--- a/tests/session/create_test.php
+++ b/tests/session/create_test.php
@@ -38,6 +38,6 @@ class phpbb_session_create_test extends phpbb_session_test_case
 			self::bot('user agent', 13, '127.0.0.1'),
 			''
 		);
-		$this->assertEquals(true, $output->data['is_bot'] , 'should be a bot');
+		$this->assertEquals(true, $output->data['is_bot'], 'should be a bot');
 	}
 }
diff --git a/tests/session/garbage_collection_test.php b/tests/session/garbage_collection_test.php
index b1be958d62..e7d01785dd 100644
--- a/tests/session/garbage_collection_test.php
+++ b/tests/session/garbage_collection_test.php
@@ -24,29 +24,19 @@ class phpbb_session_garbage_collection_test extends phpbb_session_test_case
 		$this->session = $this->session_factory->get_session($this->db);
 	}
 
-	protected function assert_sessions_equal($expected, $msg)
-	{
-		$sql = 'SELECT session_id, session_user_id
-				FROM phpbb_sessions
-				ORDER BY session_user_id';
-
-		$this->assertSqlResultEquals($expected, $sql, $msg);
-	}
-
 	public function test_cleanup_all()
 	{
-		$this->assert_sessions_equal(
+		$this->check_sessions_equals(
 			array(
-				array
-				(
+				array(
 					'session_id' => 'anon_session00000000000000000000',
 					'session_user_id' => 1,
 				),
-				array
-				(
+				array(
 					'session_id' => 'bar_session000000000000000000000',
 					'session_user_id' => 4,
-				)),
+				),
+			),
 			'Before test, should have some sessions.'
 		);
 		// Set session length so it clears all
@@ -55,7 +45,7 @@ class phpbb_session_garbage_collection_test extends phpbb_session_test_case
 		// There is an error unless the captcha plugin is set
 		$config['captcha_plugin'] = 'phpbb_captcha_nogd';
 		$this->session->session_gc();
-		$this->assert_sessions_equal(
+		$this->check_sessions_equals(
 			array(),
 			'After setting session time to 0, should remove all.'
 		);
diff --git a/tests/session/testable_facade.php b/tests/session/testable_facade.php
index c5e58fce05..9f0a3c5f59 100644
--- a/tests/session/testable_facade.php
+++ b/tests/session/testable_facade.php
@@ -33,7 +33,7 @@ class phpbb_session_testable_facade
 		$this->session_factory = $session_factory;
 	}
 
-	function extract_current_page (
+	function extract_current_page(
 		$root_path,
 		$php_self, 
 		$query_string,
@@ -48,7 +48,7 @@ class phpbb_session_testable_facade
 		return phpbb_session::extract_current_page($root_path);
 	}
 
-	function extract_current_hostname (
+	function extract_current_hostname(
 		$host,
 		$server_name_config,
 		$cookie_domain_config
@@ -75,7 +75,7 @@ class phpbb_session_testable_facade
 	 * @param request_overrides An array of overrides for the global request object
 	 * @return boolean False if the user is identified, otherwise true.
 	 */
-	function session_begin (
+	function session_begin(
 		$update_session_page = true,
 		$config_overrides = array(),
 		$request_overrides = array(),
@@ -90,7 +90,7 @@ class phpbb_session_testable_facade
 		return $session;
 	}
 
-	function session_create (
+	function session_create(
 		$user_id = false,
 		$set_admin = false,
 		$persist_login = false,
diff --git a/tests/session/validate_referrer_test.php b/tests/session/validate_referrer_test.php
index f78bf36c1b..a302229287 100644
--- a/tests/session/validate_referrer_test.php
+++ b/tests/session/validate_referrer_test.php
@@ -16,7 +16,8 @@ class phpbb_session_validate_referrer_test extends phpbb_session_test_case
 		return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/sessions_empty.xml');
 	}
 
-	static function referrer_inputs() {
+	static function referrer_inputs()
+	{
 		$ex = "example.org";
 		$alt = "example.com";
 		return array(
@@ -39,8 +40,8 @@ class phpbb_session_validate_referrer_test extends phpbb_session_test_case
 		);
 	}
 
-	/** @dataProvider  referrer_inputs */
-	function test_referrer_inputs (
+	/** @dataProvider referrer_inputs */
+	function test_referrer_inputs(
 		$check_script_path,
 		$referrer,
 		$host,
diff --git a/tests/test_framework/phpbb_session_test_case.php b/tests/test_framework/phpbb_session_test_case.php
index 6ff7d8e2ef..e6a2b03bba 100644
--- a/tests/test_framework/phpbb_session_test_case.php
+++ b/tests/test_framework/phpbb_session_test_case.php
@@ -24,4 +24,13 @@ abstract class phpbb_session_test_case extends phpbb_database_test_case
 		$this->session_facade =
 			new phpbb_session_testable_facade($this->db, $this->session_factory);
 	}
+
+	protected function check_sessions_equals($expected_sessions, $message)
+	{
+		$sql = 'SELECT session_id, session_user_id
+				FROM phpbb_sessions
+				ORDER BY session_user_id';
+
+		$this->assertSqlResultEquals($expected_sessions, $sql, $message);
+	}
 }
-- 
cgit v1.2.1


From c36699811221b17c563a7525b790e0c6c3ab98e0 Mon Sep 17 00:00:00 2001
From: Bruno Ais <brunoaiss@gmail.com>
Date: Tue, 23 Jul 2013 12:47:18 +0100
Subject: [ticket/11654] Moved some code to reduce line width.

sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11654
---
 phpBB/includes/mcp/mcp_warn.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/phpBB/includes/mcp/mcp_warn.php b/phpBB/includes/mcp/mcp_warn.php
index 65cf641418..bb21d3d377 100644
--- a/phpBB/includes/mcp/mcp_warn.php
+++ b/phpBB/includes/mcp/mcp_warn.php
@@ -289,7 +289,8 @@ class mcp_warn
 
 		// We want to make the message available here as a reminder
 		// Parse the message and subject
-		$message = generate_text_for_display($user_row['post_text'], $user_row['bbcode_uid'], $user_row['bbcode_bitfield'], ($user_row['bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0) | OPTION_FLAG_SMILIES, true);
+		$parse_flags = OPTION_FLAG_SMILIES | ($row['bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0);
+		$message = generate_text_for_display($user_row['post_text'], $user_row['bbcode_uid'], $user_row['bbcode_bitfield'], $parse_flags, true);
 
 		// Generate the appropriate user information for the user we are looking at
 		if (!function_exists('phpbb_get_user_avatar'))
-- 
cgit v1.2.1


From 1d2d3032d3f0f614b0df9851c373618e205580f8 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 23 Jul 2013 16:26:01 +0200
Subject: [ticket/11734] Readd accidently removed language strings of forum
 permissions

PHPBB3-11734
---
 phpBB/language/en/acp/permissions_phpbb.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/phpBB/language/en/acp/permissions_phpbb.php b/phpBB/language/en/acp/permissions_phpbb.php
index d0128db34a..5ea151f6ea 100644
--- a/phpBB/language/en/acp/permissions_phpbb.php
+++ b/phpBB/language/en/acp/permissions_phpbb.php
@@ -102,6 +102,17 @@ $lang = array_merge($lang, array(
 
 // Forum Permissions
 $lang = array_merge($lang, array(
+	'ACL_F_LIST'		=> 'Can see forum',
+	'ACL_F_READ'		=> 'Can read forum',
+	'ACL_F_SEARCH'		=> 'Can search the forum',
+	'ACL_F_SUBSCRIBE'	=> 'Can subscribe forum',
+	'ACL_F_PRINT'		=> 'Can print topics',
+	'ACL_F_EMAIL'		=> 'Can email topics',
+	'ACL_F_BUMP'		=> 'Can bump topics',
+	'ACL_F_USER_LOCK'	=> 'Can lock own topics',
+	'ACL_F_DOWNLOAD'	=> 'Can download files',
+	'ACL_F_REPORT'		=> 'Can report posts',
+
 	'ACL_F_POST'		=> 'Can start new topics',
 	'ACL_F_STICKY'		=> 'Can post stickies',
 	'ACL_F_ANNOUNCE'	=> 'Can post announcements',
-- 
cgit v1.2.1


From bf04bfcced7934704e7f2682ee608f490cb3fc76 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Tue, 23 Jul 2013 11:16:23 -0500
Subject: [ticket/11667] Use @inheritdoc

PHPBB3-11667
---
 phpBB/phpbb/template/twig/node/includecss.php | 9 ++-------
 phpBB/phpbb/template/twig/node/includejs.php  | 9 ++-------
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/phpBB/phpbb/template/twig/node/includecss.php b/phpBB/phpbb/template/twig/node/includecss.php
index 450edb3e1e..a9d9b46d69 100644
--- a/phpBB/phpbb/template/twig/node/includecss.php
+++ b/phpBB/phpbb/template/twig/node/includecss.php
@@ -10,9 +10,7 @@
 class phpbb_template_twig_node_includecss extends phpbb_template_twig_node_includeasset
 {
 	/**
-	* Get the definition name
-	*
-	* @return string (e.g. 'SCRIPTS')
+	* {@inheritdoc}
 	*/
 	public function get_definition_name()
 	{
@@ -20,10 +18,7 @@ class phpbb_template_twig_node_includecss extends phpbb_template_twig_node_inclu
 	}
 
 	/**
-	* Append the output code for the asset
-	*
-	* @param Twig_Compiler A Twig_Compiler instance
-	* @return null
+	* {@inheritdoc}
 	*/
 	public function append_asset(Twig_Compiler $compiler)
 	{
diff --git a/phpBB/phpbb/template/twig/node/includejs.php b/phpBB/phpbb/template/twig/node/includejs.php
index 50ab448e0f..2b4b55fb0a 100644
--- a/phpBB/phpbb/template/twig/node/includejs.php
+++ b/phpBB/phpbb/template/twig/node/includejs.php
@@ -10,9 +10,7 @@
 class phpbb_template_twig_node_includejs extends phpbb_template_twig_node_includeasset
 {
 	/**
-	* Get the definition name
-	*
-	* @return string (e.g. 'SCRIPTS')
+	* {@inheritdoc}
 	*/
 	public function get_definition_name()
 	{
@@ -20,10 +18,7 @@ class phpbb_template_twig_node_includejs extends phpbb_template_twig_node_includ
 	}
 
 	/**
-	* Append the output code for the asset
-	*
-	* @param Twig_Compiler A Twig_Compiler instance
-	* @return null
+	* {@inheritdoc}
 	*/
 	protected function append_asset(Twig_Compiler $compiler)
 	{
-- 
cgit v1.2.1


From 13fa346e8f5b496f5e51ea20e9420a48228a5072 Mon Sep 17 00:00:00 2001
From: Bruno Ais <brunoaiss@gmail.com>
Date: Wed, 24 Jul 2013 11:38:04 +0100
Subject: [ticket/11656] Made the check for the bitfield just like other PR's

sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11656
---
 phpBB/memberlist.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php
index f8ee82084c..018526d034 100644
--- a/phpBB/memberlist.php
+++ b/phpBB/memberlist.php
@@ -561,7 +561,8 @@ switch ($mode)
 
 		if ($member['user_sig'])
 		{
-			$member['user_sig'] = generate_text_for_display($member['user_sig'], $member['user_sig_bbcode_uid'], $member['user_sig_bbcode_bitfield'], OPTION_FLAG_BBCODE | OPTION_FLAG_SMILIES, true);
+			$parse_flags = ($member['user_sig_bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0) | OPTION_FLAG_SMILIES;
+			$member['user_sig'] = generate_text_for_display($member['user_sig'], $member['user_sig_bbcode_uid'], $member['user_sig_bbcode_bitfield'], $parse_flags, true);
 		}
 
 		$poster_avatar = phpbb_get_user_avatar($member);
-- 
cgit v1.2.1


From 4ed322b5b8642ec8d0a6faf23d9ea751e81dbf69 Mon Sep 17 00:00:00 2001
From: Bruno Ais <brunoaiss@gmail.com>
Date: Wed, 24 Jul 2013 11:59:28 +0100
Subject: [ticket/11638] Updated: bitwise $parse_flags use optionset()

sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11638
---
 phpBB/viewtopic.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index de76d1186d..303b9bb6da 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -1381,8 +1381,9 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i)
 	// End signature parsing, only if needed
 	if ($user_cache[$poster_id]['sig'] && $row['enable_sig'] && empty($user_cache[$poster_id]['sig_parsed']))
 	{
-		$include_bbcode_parse = $user_cache[$poster_id]['sig_bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0;
-		$user_cache[$poster_id]['sig'] = generate_text_for_display($user_cache[$poster_id]['sig'], $user_cache[$poster_id]['sig_bbcode_uid'], $user_cache[$poster_id]['sig_bbcode_bitfield'],  $include_bbcode_parse | OPTION_FLAG_SMILIES, true);
+		$parse_flags = phpbb_optionset(OPTION_FLAG_SMILIES, true, 0);
+		$parse_flags = phpbb_optionset(OPTION_FLAG_BBCODE, $user_cache[$poster_id]['sig_bbcode_bitfield'], $parse_flag);
+		$user_cache[$poster_id]['sig'] = generate_text_for_display($user_cache[$poster_id]['sig'], $user_cache[$poster_id]['sig_bbcode_uid'], $parse_flags, true);
 	}
 
 	// Parse the message and subject
-- 
cgit v1.2.1


From 029015e1542e7719d4a35d350093f4dfb3a7313e Mon Sep 17 00:00:00 2001
From: Bruno Ais <brunoaiss@gmail.com>
Date: Wed, 24 Jul 2013 12:31:14 +0100
Subject: [ticket/11638] Reverted to use the $parse tags way as the other ones

sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11638
---
 phpBB/viewtopic.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index 303b9bb6da..a0e7eb6a94 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -1381,9 +1381,8 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i)
 	// End signature parsing, only if needed
 	if ($user_cache[$poster_id]['sig'] && $row['enable_sig'] && empty($user_cache[$poster_id]['sig_parsed']))
 	{
-		$parse_flags = phpbb_optionset(OPTION_FLAG_SMILIES, true, 0);
-		$parse_flags = phpbb_optionset(OPTION_FLAG_BBCODE, $user_cache[$poster_id]['sig_bbcode_bitfield'], $parse_flag);
-		$user_cache[$poster_id]['sig'] = generate_text_for_display($user_cache[$poster_id]['sig'], $user_cache[$poster_id]['sig_bbcode_uid'], $parse_flags, true);
+		$parse_flags = ($user_cache[$poster_id]['sig_bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0) | OPTION_FLAG_SMILIES;
+		$user_cache[$poster_id]['sig'] = generate_text_for_display($user_cache[$poster_id]['sig'], $user_cache[$poster_id]['sig_bbcode_uid'], $user_cache[$poster_id]['sig_bbcode_bitfield'],  $parse_flags, true);
 	}
 
 	// Parse the message and subject
-- 
cgit v1.2.1


From 6c68348a71891219b039ae98a5a0af2fd52d3956 Mon Sep 17 00:00:00 2001
From: Bruno Ais <brunoaiss@gmail.com>
Date: Wed, 24 Jul 2013 12:31:38 +0100
Subject: [ticket/11638] Use the $parse_flags like the other commits

sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11638
---
 phpBB/viewtopic.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index a0e7eb6a94..151176fc6f 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -1386,7 +1386,8 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i)
 	}
 
 	// Parse the message and subject
-	$message = generate_text_for_display($row['post_text'], $row['bbcode_uid'], $row['bbcode_bitfield'], ($row['bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0) | OPTION_FLAG_SMILIES, true);
+	$parse_flags = ($row['bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0) | OPTION_FLAG_SMILIES;
+	$message = generate_text_for_display($row['post_text'], $row['bbcode_uid'], $row['bbcode_bitfield'], $parse_flags, true);
 
 	if (!empty($attachments[$row['post_id']]))
 	{
-- 
cgit v1.2.1


From 4cdccbd42b2f6ee54c6edb7f96ec3a0cac2ae8ea Mon Sep 17 00:00:00 2001
From: Bruno Ais <brunoaiss@gmail.com>
Date: Wed, 24 Jul 2013 12:45:23 +0100
Subject: [ticket/11638] Removed the unneeded reset.

sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11638
---
 phpBB/viewtopic.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index 151176fc6f..64006fbe61 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -830,7 +830,7 @@ if (!empty($topic_data['poll_start']))
 
 	$parse_bbcode_flags = OPTION_FLAG_SMILIES;
 	
-	if(empty($poll_info[0]['bbcode_bitfield']))
+	if (empty($poll_info[0]['bbcode_bitfield']))
 	{
 		$parse_bbcode_flags |= OPTION_FLAG_BBCODE; 
 	}
@@ -841,8 +841,6 @@ if (!empty($topic_data['poll_start']))
 	}
 
 	$topic_data['poll_title'] = generate_text_for_display($topic_data['poll_title'], $poll_info[0]['bbcode_uid'], $poll_info[0]['bbcode_bitfield'], $parse_bbcode_flags, true);
-	 
-	unset($parse_bbcode_flags);
 
 	foreach ($poll_info as $poll_option)
 	{
-- 
cgit v1.2.1


From 27126e065dd6a8de44c9da718b4b5b9895544bb1 Mon Sep 17 00:00:00 2001
From: Oliver Schramm <oliver.schramm97@gmail.com>
Date: Wed, 24 Jul 2013 17:22:10 +0200
Subject: [ticket/11741] Fix empty brackets and remove bullet

PHPBB3-11741
---
 phpBB/styles/subsilver2/template/overall_header.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html
index bc2307154b..b0d7ce6fab 100644
--- a/phpBB/styles/subsilver2/template/overall_header.html
+++ b/phpBB/styles/subsilver2/template/overall_header.html
@@ -154,8 +154,8 @@ function marklist(id, name, state)
 		<table width="100%" cellspacing="0">
 		<tr>
 			<td class="genmed">
-				<!-- IF S_NOTIFICATIONS_DISPLAY -->
-					[ <a href="{U_VIEW_ALL_NOTIFICATIONS}" id="notification_list_button">{NOTIFICATIONS_COUNT}</a> ] &bull;
+				<!-- IF S_NOTIFICATIONS_DISPLAY and not S_IS_BOT and S_USER_LOGGED_IN -->
+					[ <a href="{U_VIEW_ALL_NOTIFICATIONS}" id="notification_list_button">{NOTIFICATIONS_COUNT}</a> ]&nbsp;
 					<div id="notification_list" class="notification_list">
 						<div class="row1 header">
 							{L_NOTIFICATIONS}
-- 
cgit v1.2.1


From 5af63a7860678ac55f84201cf7dbbdf82dcdc8e8 Mon Sep 17 00:00:00 2001
From: Oliver Schramm <oliver.schramm97@gmail.com>
Date: Wed, 24 Jul 2013 18:15:03 +0200
Subject: [ticket/10917] Fixed notice that files are out of date when updating
 to an unreleased version

PHPBB3-10917
---
 phpBB/install/install_update.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php
index c18a0fb4ec..5393040061 100644
--- a/phpBB/install/install_update.php
+++ b/phpBB/install/install_update.php
@@ -204,7 +204,7 @@ class install_update extends module
 		}
 
 		// Check if the update files stored are for the latest version...
-		if ($this->latest_version != $this->update_info['version']['to'])
+		if (version_compare(strtolower($this->latest_version), strtolower($this->update_info['version']['to']), '>'))
 		{
 			$this->unequal_version = true;
 
-- 
cgit v1.2.1


From e80503696350d7410e82e63e9d108d65e3c35696 Mon Sep 17 00:00:00 2001
From: Oliver Schramm <oliver.schramm97@gmail.com>
Date: Wed, 24 Jul 2013 19:08:49 +0200
Subject: [ticket/10917] Using phpbb wrapper

PHPBB3-10917
---
 phpBB/install/install_update.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php
index 5393040061..5419e3edf1 100644
--- a/phpBB/install/install_update.php
+++ b/phpBB/install/install_update.php
@@ -204,7 +204,7 @@ class install_update extends module
 		}
 
 		// Check if the update files stored are for the latest version...
-		if (version_compare(strtolower($this->latest_version), strtolower($this->update_info['version']['to']), '>'))
+		if (phpbb_version_compare($this->latest_version, $this->update_info['version']['to'], '>'))
 		{
 			$this->unequal_version = true;
 
-- 
cgit v1.2.1


From a9f05775025f010339fee5607df9b890abf472f8 Mon Sep 17 00:00:00 2001
From: Oliver Schramm <oliver.schramm97@gmail.com>
Date: Thu, 25 Jul 2013 12:29:25 +0200
Subject: [ticket/11062] Load new strings from user's language file if provided

PHPBB3-11062
---
 phpBB/install/install_update.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php
index c18a0fb4ec..0afd6b07bb 100644
--- a/phpBB/install/install_update.php
+++ b/phpBB/install/install_update.php
@@ -232,6 +232,13 @@ class install_update extends module
 			}
 
 			// What about the language file? Got it updated?
+			if (in_array('language/' . $language . '/install.' . $phpEx, $this->update_info['files']))
+			{
+				$lang = array();
+				include($this->new_location . 'language/' . $language . '/install.' . $phpEx);
+				// this is the user's language.. just merge it
+				$user->lang = array_merge($user->lang, $lang);
+			}
 			if (in_array('language/en/install.' . $phpEx, $this->update_info['files']))
 			{
 				$lang = array();
-- 
cgit v1.2.1


From 7304ac9c3ca817716f14bb8817a201b149e5ebef Mon Sep 17 00:00:00 2001
From: Oliver Schramm <oliver.schramm97@gmail.com>
Date: Thu, 25 Jul 2013 13:10:45 +0200
Subject: [ticket/11062] If user's language is english there is no further work
 needed

PHPBB3-11062
---
 phpBB/install/install_update.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php
index 0afd6b07bb..9823703f0a 100644
--- a/phpBB/install/install_update.php
+++ b/phpBB/install/install_update.php
@@ -239,7 +239,7 @@ class install_update extends module
 				// this is the user's language.. just merge it
 				$user->lang = array_merge($user->lang, $lang);
 			}
-			if (in_array('language/en/install.' . $phpEx, $this->update_info['files']))
+			if ($language != 'en' && in_array('language/en/install.' . $phpEx, $this->update_info['files']))
 			{
 				$lang = array();
 				include($this->new_location . 'language/en/install.' . $phpEx);
-- 
cgit v1.2.1


From c5de4dd51dfba4737e4b46af05546f3c6a4f8da6 Mon Sep 17 00:00:00 2001
From: MichaelC <m@michaelcullum.com>
Date: Thu, 25 Jul 2013 13:06:11 +0100
Subject: [ticket/11740] Update FAQ to include Ideas Centre

PHPBB3-11740
---
 phpBB/language/en/help_faq.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/language/en/help_faq.php b/phpBB/language/en/help_faq.php
index dab66779c3..b68336e0f7 100644
--- a/phpBB/language/en/help_faq.php
+++ b/phpBB/language/en/help_faq.php
@@ -333,7 +333,7 @@ $help = array(
 	),
 	array(
 		0 => 'Why isn’t X feature available?',
-		1 => 'This software was written by and licensed through phpBB Group. If you believe a feature needs to be added, or you want to report a bug, please visit the phpBB <a href="http://area51.phpbb.com/">Area51</a> website, where you will find resources to do so.'
+		1 => 'This software was written by and licensed through phpBB Group. If you believe a feature needs to be added please visit the <a href="https://www.phpbb.com/ideas/">phpBB Ideas Centre</a>, where you can upvote existing ideas or suggest new features.'
 	),
 	array(
 		0 => 'Who do I contact about abusive and/or legal matters related to this board?',
-- 
cgit v1.2.1


From 9e68404de5277de23baa153a29f4a3825e233e1e Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Sat, 27 Jul 2013 10:44:39 -0700
Subject: [ticket/11749] PHP Events for search.php

PHPBB3-11749
---
 phpBB/search.php | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/phpBB/search.php b/phpBB/search.php
index 8bcbfc498b..d0484bf598 100644
--- a/phpBB/search.php
+++ b/phpBB/search.php
@@ -687,6 +687,18 @@ if ($keywords || $author || $author_id || $search_id || $submit)
 				$tracking_topics = ($tracking_topics) ? tracking_unserialize($tracking_topics) : array();
 			}
 
+			/**
+			* Event to modify the SQL query before the topic data is retrieved
+			*
+			* @event core.search_get_topic_data
+			* @var	string	sql_select		The SQL SELECT string used by search to get topic data
+			* @var	string	sql_from		The SQL FROM string used by search to get topic data
+			* @var	string	sql_where		The SQL WHERE string used by search to get topic data
+			* @since 3.1-A1
+			*/
+			$vars = array('sql_select', 'sql_from', 'sql_where');
+			extract($phpbb_dispatcher->trigger_event('core.search_get_topic_data', compact($vars)));
+
 			$sql = "SELECT $sql_select
 				FROM $sql_from
 				WHERE $sql_where";
@@ -989,6 +1001,17 @@ if ($keywords || $author || $author_id || $search_id || $submit)
 				);
 			}
 
+			/**
+			* Modify the topic data before it is assigned to the template
+			*
+			* @event core.search_modify_tpl_ary
+			* @var	array	row			Array with topic data
+			* @var	array	tpl_ary		Template block array with topic data
+			* @since 3.1-A1
+			*/
+			$vars = array('row', 'tpl_ary');
+			extract($phpbb_dispatcher->trigger_event('core.search_modify_tpl_ary', compact($vars)));
+
 			$template->assign_block_vars('searchresults', array_merge($tpl_ary, array(
 				'FORUM_ID'			=> $forum_id,
 				'TOPIC_ID'			=> $result_topic_id,
-- 
cgit v1.2.1


From 9ffb150d47d3db42c1816ffa662e73046a1b5d03 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Sat, 27 Jul 2013 10:45:40 -0700
Subject: [ticket/11749] PHP Events for viewforum.php

PHPBB3-11749
---
 phpBB/viewforum.php | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php
index 5a59e021b3..1fa2030671 100644
--- a/phpBB/viewforum.php
+++ b/phpBB/viewforum.php
@@ -372,6 +372,16 @@ $sql_array = array(
 	'LEFT_JOIN'	=> array(),
 );
 
+/**
+* Event to modify the SQL query before the topic data is retrieved
+*
+* @event core.viewforum_get_topic_data
+* @var	array	sql_array		The SQL array to get the data of all topics
+* @since 3.1-A1
+*/
+$vars = array('sql_array');
+extract($phpbb_dispatcher->trigger_event('core.viewforum_get_topic_data', compact($vars)));
+
 $sql_approved = ' AND ' . $phpbb_content_visibility->get_visibility_sql('topic', $forum_id, 't.');
 
 if ($user->data['is_registered'])
@@ -554,6 +564,17 @@ if (sizeof($shadow_topic_list))
 	$sql = 'SELECT *
 		FROM ' . TOPICS_TABLE . '
 		WHERE ' . $db->sql_in_set('topic_id', array_keys($shadow_topic_list));
+
+	/**
+	* Event to modify the SQL query before the shadowtopic data is retrieved
+	*
+	* @event core.viewforum_get_shadowtopic_data
+	* @var	string	sql		The SQL string to get the data of any shadowtopics
+	* @since 3.1-A1
+	*/
+	$vars = array('sql');
+	extract($phpbb_dispatcher->trigger_event('core.viewforum_get_shadowtopic_data', compact($vars)));
+
 	$result = $db->sql_query($sql);
 
 	while ($row = $db->sql_fetchrow($result))
-- 
cgit v1.2.1


From 8e636e4572ef11af61f2b2c6dfb56d7a9530c8de Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Sat, 27 Jul 2013 10:48:40 -0700
Subject: [ticket/11749] Template events for topic_list_row_pre/append

PHPBB3-11749
---
 phpBB/docs/events.md                                 | 18 ++++++++++++++++++
 phpBB/styles/prosilver/template/search_results.html  |  2 ++
 phpBB/styles/prosilver/template/viewforum_body.html  |  2 ++
 phpBB/styles/subsilver2/template/search_results.html |  2 ++
 phpBB/styles/subsilver2/template/viewforum_body.html |  4 ++++
 5 files changed, 28 insertions(+)

diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md
index 3723bf7b3f..855f238653 100644
--- a/phpBB/docs/events.md
+++ b/phpBB/docs/events.md
@@ -114,6 +114,24 @@ simple_footer_after
 * Location: styles/prosilver/template/simple_footer.html
 * Purpose: Add content directly prior to the `</body>` tag of the simple footer
 
+topiclist_row_prepend
+===
+* Locations:
+    + styles/prosilver/template/search_results.html
+    + styles/prosilver/template/viewforum_body.html
+    + styles/subsilver2/template/search_results.html
+    + styles/subsilver2/template/viewforum_body.html
+* Purpose: Add content into topic rows (inside the elements containing topic titles)
+
+topiclist_row_append
+===
+* Locations:
+    + styles/prosilver/template/search_results.html
+    + styles/prosilver/template/viewforum_body.html
+    + styles/subsilver2/template/search_results.html
+    + styles/subsilver2/template/viewforum_body.html
+* Purpose: Add content into topic rows (inside the elements containing topic titles)
+
 ucp_pm_viewmessage_print_head_append
 ===
 * Location: styles/prosilver/template/ucp_pm_viewmessage_print.html
diff --git a/phpBB/styles/prosilver/template/search_results.html b/phpBB/styles/prosilver/template/search_results.html
index f0424c45db..54e8867526 100644
--- a/phpBB/styles/prosilver/template/search_results.html
+++ b/phpBB/styles/prosilver/template/search_results.html
@@ -63,6 +63,7 @@
 					<dt <!-- IF searchresults.TOPIC_ICON_IMG -->style="background-image: url({T_ICONS_PATH}{searchresults.TOPIC_ICON_IMG}); background-repeat: no-repeat;"<!-- ENDIF --> title="{searchresults.TOPIC_FOLDER_IMG_ALT}">
 						<div class="list-inner">
 
+							<!-- EVENT topiclist_row_prepend -->
 							<!-- IF searchresults.S_UNREAD_TOPIC --><a href="{searchresults.U_NEWEST_POST}">{NEWEST_POST_IMG}</a> <!-- ENDIF -->
 							<a href="{searchresults.U_VIEW_TOPIC}" class="topictitle">{searchresults.TOPIC_TITLE}</a> {searchresults.ATTACH_ICON_IMG}
 							<!-- IF searchresults.S_TOPIC_UNAPPROVED or searchresults.S_POSTS_UNAPPROVED --><a href="{searchresults.U_MCP_QUEUE}">{searchresults.UNAPPROVED_IMG}</a> <!-- ENDIF -->
@@ -83,6 +84,7 @@
 							</div>
 							<!-- ENDIF -->
 							{L_POST_BY_AUTHOR} {searchresults.TOPIC_AUTHOR_FULL} &raquo; {searchresults.FIRST_POST_TIME} &raquo; {L_IN} <a href="{searchresults.U_VIEW_FORUM}">{searchresults.FORUM_TITLE}</a>
+							<!-- EVENT topiclist_row_append -->
 
 						</div>
 					</dt>
diff --git a/phpBB/styles/prosilver/template/viewforum_body.html b/phpBB/styles/prosilver/template/viewforum_body.html
index 69b0608a64..ecd993d7fb 100644
--- a/phpBB/styles/prosilver/template/viewforum_body.html
+++ b/phpBB/styles/prosilver/template/viewforum_body.html
@@ -144,6 +144,7 @@
 			<dl class="icon {topicrow.TOPIC_IMG_STYLE}">
 				<dt<!-- IF topicrow.TOPIC_ICON_IMG and S_TOPIC_ICONS --> style="background-image: url({T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}); background-repeat: no-repeat;"<!-- ENDIF --> title="{topicrow.TOPIC_FOLDER_IMG_ALT}">
 					<div class="list-inner">
+						<!-- EVENT topiclist_row_prepend -->
 						<!-- IF topicrow.S_UNREAD_TOPIC --><a href="{topicrow.U_NEWEST_POST}">{NEWEST_POST_IMG}</a> <!-- ENDIF --><a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a>
 						<!-- IF topicrow.S_TOPIC_UNAPPROVED or topicrow.S_POSTS_UNAPPROVED --><a href="{topicrow.U_MCP_QUEUE}">{topicrow.UNAPPROVED_IMG}</a> <!-- ENDIF -->
 						<!-- IF topicrow.S_TOPIC_DELETED --><a href="{topicrow.U_MCP_QUEUE}">{DELETED_IMG}</a> <!-- ENDIF -->
@@ -164,6 +165,7 @@
 						<!-- ENDIF -->
 						<!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF -->{L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} &raquo; {topicrow.FIRST_POST_TIME}
 						<!-- IF topicrow.S_POST_GLOBAL and FORUM_ID != topicrow.FORUM_ID --> &raquo; {L_IN} <a href="{topicrow.U_VIEW_FORUM}">{topicrow.FORUM_NAME}</a><!-- ENDIF -->
+						<!-- EVENT topiclist_row_append -->
 					</div>
 				</dt>
 				<dd class="posts">{topicrow.REPLIES} <dfn>{L_REPLIES}</dfn></dd>
diff --git a/phpBB/styles/subsilver2/template/search_results.html b/phpBB/styles/subsilver2/template/search_results.html
index d98079de20..19ba0b196a 100644
--- a/phpBB/styles/subsilver2/template/search_results.html
+++ b/phpBB/styles/subsilver2/template/search_results.html
@@ -34,6 +34,7 @@
 			<!-- ENDIF -->
 			</td>
 			<td class="row1">
+				<!-- EVENT topiclist_row_prepend -->
 				<!-- IF searchresults.S_UNREAD_TOPIC --><a href="{searchresults.U_NEWEST_POST}" class="imageset">{NEWEST_POST_IMG}</a><!-- ENDIF -->
 				{searchresults.ATTACH_ICON_IMG} <a href="{searchresults.U_VIEW_TOPIC}" class="topictitle">{searchresults.TOPIC_TITLE}</a>
 				<!-- IF searchresults.S_TOPIC_UNAPPROVED or searchresults.S_POSTS_UNAPPROVED -->
@@ -58,6 +59,7 @@
 					] </p>
 				<!-- ENDIF -->
 				<p class="gensmall">{L_IN} <a href="{searchresults.U_VIEW_FORUM}">{searchresults.FORUM_TITLE}</a></p>
+				<!-- EVENT topiclist_row_append -->
 			</td>
 			<td class="row2" width="100" align="center"><p class="topicauthor">{searchresults.TOPIC_AUTHOR_FULL}</p></td>
 			<td class="row1" width="50" align="center"><p class="topicdetails">{searchresults.TOPIC_REPLIES}</p></td>
diff --git a/phpBB/styles/subsilver2/template/viewforum_body.html b/phpBB/styles/subsilver2/template/viewforum_body.html
index d07e9a1372..dfbe0a605b 100644
--- a/phpBB/styles/subsilver2/template/viewforum_body.html
+++ b/phpBB/styles/subsilver2/template/viewforum_body.html
@@ -40,6 +40,7 @@
 				<td class="row1" width="25" align="center"><!-- IF topicrow.TOPIC_ICON_IMG --><img src="{T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}" width="{topicrow.TOPIC_ICON_IMG_WIDTH}" height="{topicrow.TOPIC_ICON_IMG_HEIGHT}" alt="" title="" /><!-- ENDIF --></td>
 			<!-- ENDIF -->
 			<td class="row1">
+				<!-- EVENT topiclist_row_prepend -->
 				<!-- IF topicrow.S_UNREAD_TOPIC --><a href="{topicrow.U_NEWEST_POST}" class="imageset">{NEWEST_POST_IMG}</a><!-- ENDIF -->
 				{topicrow.ATTACH_ICON_IMG} <!-- IF topicrow.S_HAS_POLL or topicrow.S_TOPIC_MOVED --><b>{topicrow.TOPIC_TYPE}</b> <!-- ENDIF --><a title="{L_POSTED}{L_COLON} {topicrow.FIRST_POST_TIME}" href="{topicrow.U_VIEW_TOPIC}"class="topictitle">{topicrow.TOPIC_TITLE}</a>
 				<!-- IF topicrow.S_TOPIC_UNAPPROVED or topicrow.S_POSTS_UNAPPROVED -->
@@ -63,6 +64,7 @@
 					<!-- END pagination -->
 					] </p>
 				<!-- ENDIF -->
+				<!-- EVENT topiclist_row_append -->
 			</td>
 			<td class="row2" width="130" align="center"><p class="topicauthor">{topicrow.TOPIC_AUTHOR_FULL}</p></td>
 			<td class="row1" width="50" align="center"><p class="topicdetails">{topicrow.REPLIES}</p></td>
@@ -203,6 +205,7 @@
 					<td class="row1" width="25" align="center"><!-- IF topicrow.TOPIC_ICON_IMG --><img src="{T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}" width="{topicrow.TOPIC_ICON_IMG_WIDTH}" height="{topicrow.TOPIC_ICON_IMG_HEIGHT}" alt="" title="" /><!-- ENDIF --></td>
 				<!-- ENDIF -->
 				<td class="row1">
+					<!-- EVENT topiclist_row_prepend -->
 					<!-- IF topicrow.S_UNREAD_TOPIC --><a href="{topicrow.U_NEWEST_POST}" class="imageset">{NEWEST_POST_IMG}</a><!-- ENDIF -->
 					{topicrow.ATTACH_ICON_IMG} <!-- IF topicrow.S_HAS_POLL or topicrow.S_TOPIC_MOVED --><b>{topicrow.TOPIC_TYPE}</b> <!-- ENDIF --><a title="{L_POSTED}{L_COLON} {topicrow.FIRST_POST_TIME}" href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a>
 					<!-- IF topicrow.S_TOPIC_UNAPPROVED or topicrow.S_POSTS_UNAPPROVED -->
@@ -227,6 +230,7 @@
 						] </p>
 					<!-- ENDIF -->
 					<!-- IF topicrow.S_POST_GLOBAL and FORUM_ID != topicrow.FORUM_ID --><p class="gensmall">{L_IN} <a href="{topicrow.U_VIEW_FORUM}">{topicrow.FORUM_NAME}</a></p><!-- ENDIF -->
+					<!-- EVENT topiclist_row_append -->
 				</td>
 				<td class="row2" width="130" align="center"><p class="topicauthor">{topicrow.TOPIC_AUTHOR_FULL}</p></td>
 				<td class="row1" width="50" align="center"><p class="topicdetails">{topicrow.REPLIES}</p></td>
-- 
cgit v1.2.1


From d8584877a19ece5b5d6cd1d0ec752905ef8501e7 Mon Sep 17 00:00:00 2001
From: Oliver Schramm <oliver.schramm97@gmail.com>
Date: Sat, 27 Jul 2013 22:37:44 +0200
Subject: [ticket/10917] Revert use of phpbb wrapper

PHPBB3-10917
---
 phpBB/install/install_update.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php
index 9ac17e7579..e8fcabfc2d 100644
--- a/phpBB/install/install_update.php
+++ b/phpBB/install/install_update.php
@@ -204,7 +204,7 @@ class install_update extends module
 		}
 
 		// Check if the update files stored are for the latest version...
-		if (phpbb_version_compare($this->latest_version, $this->update_info['version']['to'], '>'))
+		if (version_compare(strtolower($this->latest_version), strtolower($this->update_info['version']['to']), '>'))
 		{
 			$this->unequal_version = true;
 
-- 
cgit v1.2.1


From dd875f13e875a726c9ea4654a90a74878658e423 Mon Sep 17 00:00:00 2001
From: Oliver Schramm <oliver.schramm97@gmail.com>
Date: Sun, 28 Jul 2013 02:35:01 +0200
Subject: [ticket/10917] Variable used only once so delete it

The variable $this->unequal_version was only used once
and only to display the version the package updates to.
To display the version it updates to makes no sense when
the update files just aren't meant to update from the
current version. (It's already shown in an error message)
So I deleted the variable from there.

Furthermore the use of version_compare makes the variable
useless in that context which is why I deleted the variable
from the whole file and replaced it in the relevant if statement
with the old comparison.

PHPBB3-10917
---
 phpBB/install/install_update.php | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php
index e8fcabfc2d..2f3ee1c55a 100644
--- a/phpBB/install/install_update.php
+++ b/phpBB/install/install_update.php
@@ -58,7 +58,6 @@ class install_update extends module
 	var $new_location;
 	var $latest_version;
 	var $current_version;
-	var $unequal_version;
 
 	var $update_to_version;
 
@@ -76,7 +75,6 @@ class install_update extends module
 
 		$this->tpl_name = 'install_update';
 		$this->page_title = 'UPDATE_INSTALLATION';
-		$this->unequal_version = false;
 
 		$this->old_location = $phpbb_root_path . 'install/update/old/';
 		$this->new_location = $phpbb_root_path . 'install/update/new/';
@@ -195,8 +193,6 @@ class install_update extends module
 		// Check if the update files are actually meant to update from the current version
 		if ($this->current_version != $this->update_info['version']['from'])
 		{
-			$this->unequal_version = true;
-
 			$template->assign_vars(array(
 				'S_ERROR'	=> true,
 				'ERROR_MSG'	=> sprintf($user->lang['INCOMPATIBLE_UPDATE_FILES'], $this->current_version, $this->update_info['version']['from'], $this->update_info['version']['to']),
@@ -206,8 +202,6 @@ class install_update extends module
 		// Check if the update files stored are for the latest version...
 		if (version_compare(strtolower($this->latest_version), strtolower($this->update_info['version']['to']), '>'))
 		{
-			$this->unequal_version = true;
-
 			$template->assign_vars(array(
 				'S_WARNING'		=> true,
 				'WARNING_MSG'	=> sprintf($user->lang['OLD_UPDATE_FILES'], $this->update_info['version']['from'], $this->update_info['version']['to'], $this->latest_version))
@@ -294,7 +288,7 @@ class install_update extends module
 				);
 
 				// Print out version the update package updates to
-				if ($this->unequal_version)
+				if ($this->latest_version != $this->update_info['version']['to'])
 				{
 					$template->assign_var('PACKAGE_VERSION', $this->update_info['version']['to']);
 				}
-- 
cgit v1.2.1


From 9902f1c75178aa72d3b89f51033fcda552141b40 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Mon, 29 Jul 2013 00:05:31 -0700
Subject: [ticket/11749] Move event after all template data has been defined

PHPBB3-11749
---
 phpBB/search.php | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/phpBB/search.php b/phpBB/search.php
index d0484bf598..40c0b9a8ce 100644
--- a/phpBB/search.php
+++ b/phpBB/search.php
@@ -1001,18 +1001,7 @@ if ($keywords || $author || $author_id || $search_id || $submit)
 				);
 			}
 
-			/**
-			* Modify the topic data before it is assigned to the template
-			*
-			* @event core.search_modify_tpl_ary
-			* @var	array	row			Array with topic data
-			* @var	array	tpl_ary		Template block array with topic data
-			* @since 3.1-A1
-			*/
-			$vars = array('row', 'tpl_ary');
-			extract($phpbb_dispatcher->trigger_event('core.search_modify_tpl_ary', compact($vars)));
-
-			$template->assign_block_vars('searchresults', array_merge($tpl_ary, array(
+			$tpl_ary = array_merge($tpl_ary, array(
 				'FORUM_ID'			=> $forum_id,
 				'TOPIC_ID'			=> $result_topic_id,
 				'POST_ID'			=> ($show_results == 'posts') ? $row['post_id'] : false,
@@ -1024,9 +1013,22 @@ if ($keywords || $author || $author_id || $search_id || $submit)
 
 				'U_VIEW_TOPIC'		=> $view_topic_url,
 				'U_VIEW_FORUM'		=> append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $forum_id),
-				'U_VIEW_POST'		=> (!empty($row['post_id'])) ? append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$forum_id&amp;t=" . $row['topic_id'] . '&amp;p=' . $row['post_id'] . (($u_hilit) ? '&amp;hilit=' . $u_hilit : '')) . '#p' . $row['post_id'] : '')
+				'U_VIEW_POST'		=> (!empty($row['post_id'])) ? append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$forum_id&amp;t=" . $row['topic_id'] . '&amp;p=' . $row['post_id'] . (($u_hilit) ? '&amp;hilit=' . $u_hilit : '')) . '#p' . $row['post_id'] : '',
 			));
 
+			/**
+			* Modify the topic data before it is assigned to the template
+			*
+			* @event core.search_modify_tpl_ary
+			* @var	array	row			Array with topic data
+			* @var	array	tpl_ary		Template block array with topic data
+			* @since 3.1-A1
+			*/
+			$vars = array('row', 'tpl_ary');
+			extract($phpbb_dispatcher->trigger_event('core.search_modify_tpl_ary', compact($vars)));
+
+			$template->assign_block_vars('searchresults', $tpl_ary);
+
 			if ($show_results == 'topics')
 			{
 				phpbb_generate_template_pagination($template, $view_topic_url, 'searchresults.pagination', 'start', $replies + 1, $config['posts_per_page'], 1, true, true);
-- 
cgit v1.2.1


From b8fef3b33a5c04c6637667b0a9a9f3b24ba2c594 Mon Sep 17 00:00:00 2001
From: Bruno Ais <brunoaiss@gmail.com>
Date: Mon, 29 Jul 2013 16:55:58 +0100
Subject: [ticket/11640] removed the space that I wonder what it was doing
 there.

sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11640
---
 phpBB/includes/functions_privmsgs.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index 15907feedd..5fc6de8e02 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -2022,7 +2022,7 @@ function message_history($msg_id, $user_id, $message_row, $folder, $in_post_mode
 		$parse_flags = ($row['bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0);
 		$parse_flags |= ($row['enable_smilies'] ? OPTION_FLAG_SMILIES : 0);
 		
-		$message = generate_text_for_display($message, $row['bbcode_uid'], $row['bbcode_bitfield'], $parse_flags , false);
+		$message = generate_text_for_display($message, $row['bbcode_uid'], $row['bbcode_bitfield'], $parse_flags, false);
 
 		$subject = censor_text($subject);
 
-- 
cgit v1.2.1


From ccc5c5f6b8c197c0f96349e139472ddbe17f19ce Mon Sep 17 00:00:00 2001
From: Bruno Ais <brunoaiss@gmail.com>
Date: Mon, 29 Jul 2013 17:00:51 +0100
Subject: [ticket/11638] Changed the layout to match the other similar commits

sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11638
---
 phpBB/viewtopic.php | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index 64006fbe61..a24c40f697 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -828,19 +828,14 @@ if (!empty($topic_data['poll_start']))
 		$poll_total += $poll_option['poll_option_total'];
 	}
 
-	$parse_bbcode_flags = OPTION_FLAG_SMILIES;
-	
-	if (empty($poll_info[0]['bbcode_bitfield']))
-	{
-		$parse_bbcode_flags |= OPTION_FLAG_BBCODE; 
-	}
+	$parse_flags = ($row['bbcode_bitfield'] ? OPTION_FLAG_BBCODE : 0) | OPTION_FLAG_SMILIES;
 
 	for ($i = 0, $size = sizeof($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_bbcode_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);
 	}
 
-	$topic_data['poll_title'] = generate_text_for_display($topic_data['poll_title'], $poll_info[0]['bbcode_uid'], $poll_info[0]['bbcode_bitfield'], $parse_bbcode_flags, true);
+	$topic_data['poll_title'] = generate_text_for_display($topic_data['poll_title'], $poll_info[0]['bbcode_uid'], $poll_info[0]['bbcode_bitfield'], $parse_flags, true);
 
 	foreach ($poll_info as $poll_option)
 	{
-- 
cgit v1.2.1