15 files changed, 627 insertions, 124 deletions
diff --git a/phpBB/docs/AUTHORS b/phpBB/docs/AUTHORS
index fcef26daa1..5995bd2ab4 100644
--- a/phpBB/docs/AUTHORS
+++ b/phpBB/docs/AUTHORS
@@ -24,10 +24,9 @@ phpBB Lead Developer:  naderman (Nils Adermann)
 
 phpBB Developers:      bantu (Andreas Fischer)
                        EXreaction (Nathan Guse)
-                       igorw (Igor Wiedler)
+                       dhruv.goel92 (Dhruv Goel)
                        imkingdavid (David King)
                        nickvergessen (Joas Schilling)
-                       Oleg (Oleg Pudeyev)
 
 Contributions by:      leviatan21 (Gabriel Vazquez)
                        Raimon (Raimon Meuldijk)
@@ -53,6 +52,8 @@ phpBB Developers:      A_Jelly_Doughnut (Josh Woody) [01/2010 - 11/2010]
                        dhn (Dominik Dröscher)        [05/2007 - 01/2011]
                        GrahamJE (Graham Eames)       [09/2005 - 11/2006]
                        kellanved (Henry Sudhof)      [04/2007 - 03/2011]
+                       igorw (Igor Wiedler)          [08/2010 - 02/2013]
+                       Oleg (Oleg Pudeyev)           [01/2011 - 05/2013]
                        rxu (Ruslan Uzdenov)          [04/2010 - 12/2012]
                        TerraFrost (Jim Wigginton)    [04/2009 - 01/2011]
                        ToonArmy (Chris Smith)        [06/2008 - 11/2011]
diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php
index 83c355540e..9b9ea38e07 100644
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -80,6 +80,11 @@ class acp_groups
 			case 'approve':
 			case 'demote':
 			case 'promote':
+				if (!check_form_key($form_key))
+				{
+					trigger_error($user->lang['FORM_INVALID'] . adm_back_link($this->u_action), E_USER_WARNING);
+				}
+
 				if (!$group_id)
 				{
 					trigger_error($user->lang['NO_GROUP'] . adm_back_link($this->u_action), E_USER_WARNING);
@@ -252,6 +257,11 @@ class acp_groups
 			break;
 
 			case 'addusers':
+				if (!check_form_key($form_key))
+				{
+					trigger_error($user->lang['FORM_INVALID'] . adm_back_link($this->u_action), E_USER_WARNING);
+				}
+
 				if (!$group_id)
 				{
 					trigger_error($user->lang['NO_GROUP'] . adm_back_link($this->u_action), E_USER_WARNING);
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index e5cbae0d71..2e5130c5b8 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -423,16 +423,6 @@ function upload_attachment($form_name, $forum_id, $local = false, $local_storage
 
 	$cat_id = (isset($extensions[$file->get('extension')]['display_cat'])) ? $extensions[$file->get('extension')]['display_cat'] : ATTACHMENT_CATEGORY_NONE;
 
-	// Make sure the image category only holds valid images...
-	if ($cat_id == ATTACHMENT_CATEGORY_IMAGE && !$file->is_image())
-	{
-		$file->remove();
-
-		// If this error occurs a user tried to exploit an IE Bug by renaming extensions
-		// Since the image category is displaying content inline we need to catch this.
-		trigger_error($user->lang['ATTACHED_IMAGE_NOT_IMAGE']);
-	}
-
 	// Do we have to create a thumbnail?
 	$filedata['thumbnail'] = ($cat_id == ATTACHMENT_CATEGORY_IMAGE && $config['img_create_thumbnail']) ? 1 : 0;
 
@@ -473,6 +463,16 @@ function upload_attachment($form_name, $forum_id, $local = false, $local_storage
 		return $filedata;
 	}
 
+	// Make sure the image category only holds valid images...
+	if ($cat_id == ATTACHMENT_CATEGORY_IMAGE && !$file->is_image())
+	{
+		$file->remove();
+
+		// If this error occurs a user tried to exploit an IE Bug by renaming extensions
+		// Since the image category is displaying content inline we need to catch this.
+		trigger_error($user->lang['ATTACHED_IMAGE_NOT_IMAGE']);
+	}
+
 	$filedata['filesize'] = $file->get('filesize');
 	$filedata['mimetype'] = $file->get('mimetype');
 	$filedata['extension'] = $file->get('extension');
diff --git a/phpBB/includes/search/fulltext_mysql.php b/phpBB/includes/search/fulltext_mysql.php
index bd4c003397..f28b8885e7 100644
--- a/phpBB/includes/search/fulltext_mysql.php
+++ b/phpBB/includes/search/fulltext_mysql.php
@@ -86,9 +86,16 @@ class fulltext_mysql extends search_backend
 			$engine = $info['Type'];
 		}
 
-		if ($engine != 'MyISAM')
+		$fulltext_supported =
+			$engine === 'MyISAM' ||
+			// FULLTEXT is supported on InnoDB since MySQL 5.6.4 according to
+			// http://dev.mysql.com/doc/refman/5.6/en/innodb-storage-engine.html
+			$engine === 'InnoDB' &&
+			phpbb_version_compare($db->sql_server_info(true), '5.6.4', '>=');
+
+		if (!$fulltext_supported)
 		{
-			return $user->lang['FULLTEXT_MYSQL_NOT_MYISAM'];
+			return $user->lang['FULLTEXT_MYSQL_NOT_SUPPORTED'];
 		}
 
 		$sql = 'SHOW VARIABLES
diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php
index ec76f2a407..c18a0fb4ec 100644
--- a/phpBB/install/install_update.php
+++ b/phpBB/install/install_update.php
@@ -1656,7 +1656,9 @@ class install_update extends module
 		{
 			case 'version_info':
 				global $phpbb_root_path, $phpEx;
-				$info = get_remote_file('www.phpbb.com', '/updatecheck', ((defined('PHPBB_QA')) ? '30x_qa.txt' : '30x.txt'), $errstr, $errno);
+
+				$info = get_remote_file('version.phpbb.com', '/phpbb',
+						((defined('PHPBB_QA')) ? '30x_qa.txt' : '30x.txt'), $errstr, $errno);
 
 				if ($info !== false)
 				{
diff --git a/phpBB/language/en/acp/search.php b/phpBB/language/en/acp/search.php
index a7d687d7c2..79ac75c833 100644
--- a/phpBB/language/en/acp/search.php
+++ b/phpBB/language/en/acp/search.php
@@ -53,7 +53,7 @@ $lang = array_merge($lang, array(
 	'DELETING_INDEX_IN_PROGRESS_EXPLAIN'	=> 'The search backend is currently cleaning its index. This can take a few minutes.',
 
 	'FULLTEXT_MYSQL_INCOMPATIBLE_VERSION'	=> 'The MySQL fulltext backend can only be used with MySQL4 and above.',
-	'FULLTEXT_MYSQL_NOT_MYISAM'				=> 'MySQL fulltext indexes can only be used with MyISAM tables.',
+	'FULLTEXT_MYSQL_NOT_SUPPORTED'			=> 'MySQL fulltext indexes can only be used with MyISAM or InnoDB tables. MySQL 5.6.4 or later is required for fulltext indexes on InnoDB tables.',
 	'FULLTEXT_MYSQL_TOTAL_POSTS'			=> 'Total number of indexed posts',
 	'FULLTEXT_MYSQL_MBSTRING'				=> 'Support for non-latin UTF-8 characters using mbstring:',
 	'FULLTEXT_MYSQL_PCRE'					=> 'Support for non-latin UTF-8 characters using PCRE:',
diff --git a/tests/functional/auth_test.php b/tests/functional/auth_test.php
index 662b1bd38b..afb4f15fc2 100644
--- a/tests/functional/auth_test.php
+++ b/tests/functional/auth_test.php
@@ -17,8 +17,7 @@ class phpbb_functional_auth_test extends phpbb_functional_test_case
 		$this->login();
 
 		// check for logout link
-		$crawler = $this->request('GET', 'index.php');
-		$this->assert_response_success();
+		$crawler = self::request('GET', 'index.php');
 		$this->assertContains($this->lang('LOGOUT_USER', 'admin'), $crawler->filter('.navbar')->text());
 	}
 
@@ -26,8 +25,7 @@ class phpbb_functional_auth_test extends phpbb_functional_test_case
 	{
 		$this->create_user('anothertestuser');
 		$this->login('anothertestuser');
-		$crawler = $this->request('GET', 'index.php');
-		$this->assert_response_success();
+		$crawler = self::request('GET', 'index.php');
 		$this->assertContains('anothertestuser', $crawler->filter('.icon-logout')->text());
 	}
 
@@ -40,13 +38,11 @@ class phpbb_functional_auth_test extends phpbb_functional_test_case
 		$this->add_lang('ucp');
 
 		// logout
-		$crawler = $this->request('GET', 'ucp.php?sid=' . $this->sid . '&mode=logout');
-		$this->assert_response_success();
+		$crawler = self::request('GET', 'ucp.php?sid=' . $this->sid . '&mode=logout');
 		$this->assertContains($this->lang('LOGOUT_REDIRECT'), $crawler->filter('#message')->text());
 
 		// look for a register link, which should be visible only when logged out
-		$crawler = $this->request('GET', 'index.php');
-		$this->assert_response_success();
+		$crawler = self::request('GET', 'index.php');
 		$this->assertContains($this->lang('REGISTER'), $crawler->filter('.navbar')->text());
 	}
 }
diff --git a/tests/functional/browse_test.php b/tests/functional/browse_test.php
index b5748059c6..18a2ad9464 100644
--- a/tests/functional/browse_test.php
+++ b/tests/functional/browse_test.php
@@ -14,22 +14,19 @@ class phpbb_functional_browse_test extends phpbb_functional_test_case
 {
 	public function test_index()
 	{
-		$crawler = $this->request('GET', 'index.php');
-		$this->assert_response_success();
+		$crawler = self::request('GET', 'index.php');
 		$this->assertGreaterThan(0, $crawler->filter('.topiclist')->count());
 	}
 
 	public function test_viewforum()
 	{
-		$crawler = $this->request('GET', 'viewforum.php?f=2');
-		$this->assert_response_success();
+		$crawler = self::request('GET', 'viewforum.php?f=2');
 		$this->assertGreaterThan(0, $crawler->filter('.topiclist')->count());
 	}
 
 	public function test_viewtopic()
 	{
-		$crawler = $this->request('GET', 'viewtopic.php?t=1');
-		$this->assert_response_success();
+		$crawler = self::request('GET', 'viewtopic.php?t=1');
 		$this->assertGreaterThan(0, $crawler->filter('.postbody')->count());
 	}
 }
diff --git a/tests/functional/common_groups_test.php b/tests/functional/common_groups_test.php
index 7ccd78421e..7c88ec900d 100644
--- a/tests/functional/common_groups_test.php
+++ b/tests/functional/common_groups_test.php
@@ -35,11 +35,10 @@ abstract class phpbb_functional_common_groups_test extends phpbb_functional_test
 		$this->add_lang(array('ucp', 'acp/groups'));
 
 		// Manage Administrators group
-		$crawler = $this->request('GET', $this->get_url() . '&g=5&sid=' . $this->sid);
-		$this->assert_response_success();
+		$crawler = self::request('GET', $this->get_url() . '&g=5&sid=' . $this->sid);
 		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
 		$form['group_colour']->setValue($input);
-		$crawler = $this->client->submit($form);
+		$crawler = self::submit($form);
 		$this->assertContains($this->lang($expected), $crawler->text());
 	}
 }
diff --git a/tests/functional/posting_test.php b/tests/functional/posting_test.php
index d05207edf0..9bcfcc2fda 100644
--- a/tests/functional/posting_test.php
+++ b/tests/functional/posting_test.php
@@ -19,18 +19,17 @@ class phpbb_functional_posting_test extends phpbb_functional_test_case
 		// Test creating topic
 		$post = $this->create_topic(2, 'Test Topic 1', 'This is a test topic posted by the testing framework.');
 
-		$crawler = $this->request('GET', "viewtopic.php?t={$post['topic_id']}&sid={$this->sid}");
+		$crawler = self::request('GET', "viewtopic.php?t={$post['topic_id']}&sid={$this->sid}");
 		$this->assertContains('This is a test topic posted by the testing framework.', $crawler->filter('html')->text());
 
 		// Test creating a reply
 		$post2 = $this->create_post(2, $post['topic_id'], 'Re: Test Topic 1', 'This is a test post posted by the testing framework.');
 
-		$crawler = $this->request('GET', "viewtopic.php?t={$post2['topic_id']}&sid={$this->sid}");
+		$crawler = self::request('GET', "viewtopic.php?t={$post2['topic_id']}&sid={$this->sid}");
 		$this->assertContains('This is a test post posted by the testing framework.', $crawler->filter('html')->text());
 
 		// Test quoting a message
-		$crawler = $this->request('GET', "posting.php?mode=quote&f=2&t={$post2['topic_id']}&p={$post2['post_id']}&sid={$this->sid}");
-		$this->assert_response_success();
+		$crawler = self::request('GET', "posting.php?mode=quote&f=2&t={$post2['topic_id']}&p={$post2['post_id']}&sid={$this->sid}");
 		$this->assertContains('This is a test post posted by the testing framework.', $crawler->filter('html')->text());
 	}
 
@@ -55,7 +54,7 @@ class phpbb_functional_posting_test extends phpbb_functional_test_case
 			'post'			=> true,
 		), $additional_form_data);
 
-		return $this->submit_post($posting_url, 'POST_TOPIC', $form_data);
+		return self::submit_post($posting_url, 'POST_TOPIC', $form_data);
 	}
 
 	/**
@@ -79,7 +78,7 @@ class phpbb_functional_posting_test extends phpbb_functional_test_case
 			'post'			=> true,
 		), $additional_form_data);
 
-		return $this->submit_post($posting_url, 'POST_REPLY', $form_data);
+		return self::submit_post($posting_url, 'POST_REPLY', $form_data);
 	}
 	
 	/**
@@ -94,8 +93,7 @@ class phpbb_functional_posting_test extends phpbb_functional_test_case
 	{
 		$this->add_lang('posting');
 
-		$crawler = $this->request('GET', $posting_url);
-		$this->assert_response_success();
+		$crawler = self::request('GET', $posting_url);
 		$this->assertContains($this->lang($posting_contains), $crawler->filter('html')->text());
 
 		$hidden_fields = array(
@@ -119,8 +117,7 @@ class phpbb_functional_posting_test extends phpbb_functional_test_case
 		// I use a request because the form submission method does not allow you to send data that is not
 		// contained in one of the actual form fields that the browser sees (i.e. it ignores "hidden" inputs)
 		// Instead, I send it as a request with the submit button "post" set to true.
-		$crawler = $this->client->request('POST', $posting_url, $form_data);
-		$this->assert_response_success();
+		$crawler = self::request('POST', $posting_url, $form_data);
 		$this->assertContains($this->lang('POST_STORED'), $crawler->filter('html')->text());
 
 		$url = $crawler->selectLink($this->lang('VIEW_MESSAGE', '', ''))->link()->getUri();
diff --git a/tests/functions/fixtures/obtain_online.xml b/tests/functions/fixtures/obtain_online.xml
new file mode 100644
index 0000000000..05bbe6a05e
--- /dev/null
+++ b/tests/functions/fixtures/obtain_online.xml
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<dataset>
+	<table name="phpbb_sessions">
+		<column>session_id</column>
+		<column>session_user_id</column>
+		<column>session_forum_id</column>
+		<column>session_time</column>
+		<column>session_ip</column>
+		<column>session_viewonline</column>
+	</table>
+	<table name="phpbb_users">
+		<column>user_id</column>
+		<column>username_clean</column>
+		<column>username</column>
+		<column>user_allow_viewonline</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>anonymous</value>
+			<value>1</value>
+			<value></value>
+			<value></value>
+			<value></value>
+			<value></value>
+		</row>
+		<row>
+			<value>2</value>
+			<value>2</value>
+			<value>2</value>
+			<value>1</value>
+			<value></value>
+			<value></value>
+			<value></value>
+			<value></value>
+		</row>
+		<row>
+			<value>3</value>
+			<value>3</value>
+			<value>3</value>
+			<value>1</value>
+			<value></value>
+			<value></value>
+			<value></value>
+			<value></value>
+		</row>
+		<row>
+			<value>4</value>
+			<value>4</value>
+			<value>4</value>
+			<value>1</value>
+			<value></value>
+			<value></value>
+			<value></value>
+			<value></value>
+		</row>
+		<row>
+			<value>5</value>
+			<value>5</value>
+			<value>5</value>
+			<value>1</value>
+			<value></value>
+			<value></value>
+			<value></value>
+			<value></value>
+		</row>
+		<row>
+			<value>6</value>
+			<value>6</value>
+			<value>6</value>
+			<value>0</value>
+			<value></value>
+			<value></value>
+			<value></value>
+			<value></value>
+		</row>
+		<row>
+			<value>7</value>
+			<value>7</value>
+			<value>7</value>
+			<value>0</value>
+			<value></value>
+			<value></value>
+			<value></value>
+			<value></value>
+		</row>
+		<row>
+			<value>8</value>
+			<value>8</value>
+			<value>8</value>
+			<value>0</value>
+			<value></value>
+			<value></value>
+			<value></value>
+			<value></value>
+		</row>
+		<row>
+			<value>9</value>
+			<value>9</value>
+			<value>9</value>
+			<value>0</value>
+			<value></value>
+			<value></value>
+			<value></value>
+			<value></value>
+		</row>
+		<row>
+			<value>10</value>
+			<value>10</value>
+			<value>10</value>
+			<value>0</value>
+			<value></value>
+			<value></value>
+			<value></value>
+			<value></value>
+		</row>
+	</table>
+</dataset>
diff --git a/tests/functions/obtain_online_test.php b/tests/functions/obtain_online_test.php
new file mode 100644
index 0000000000..b3beb55a96
--- /dev/null
+++ b/tests/functions/obtain_online_test.php
@@ -0,0 +1,238 @@
+<?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__) . '/../../phpBB/includes/functions.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions_content.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/auth.php';
+
+class phpbb_functions_obtain_online_test extends phpbb_database_test_case
+{
+	public function getDataSet()
+	{
+		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/obtain_online.xml');
+	}
+
+	protected function setUp()
+	{
+		parent::setUp();
+
+		global $config, $db;
+
+		$db = $this->db = $this->new_dbal();
+		$config = array(
+			'load_online_time'	=> 5,
+		);
+	}
+
+	static public function obtain_guest_count_data()
+	{
+		return array(
+			array(0, 2),
+			array(1, 1),
+		);
+	}
+
+	/**
+	* @dataProvider obtain_guest_count_data
+	*/
+	public function test_obtain_guest_count($forum_id, $expected)
+	{
+		$this->db->sql_query('DELETE FROM phpbb_sessions');
+
+		$time = time();
+		$this->create_guest_sessions($time);
+		$this->assertEquals($expected, obtain_guest_count($forum_id));
+	}
+
+	static public function obtain_users_online_data()
+	{
+		return array(
+			array(0, false, array(
+				'online_users'			=> array(2 => 2, 3 => 3, 6 => 6, 7 => 7, 10 => 10),
+				'hidden_users'			=> array(6 => 6, 7 => 7, 10 => 10),
+				'total_online'			=> 5,
+				'visible_online'		=> 2,
+				'hidden_online'			=> 3,
+				'guests_online'			=> 0,
+			)),
+			array(0, true, array(
+				'online_users'			=> array(2 => 2, 3 => 3, 6 => 6, 7 => 7, 10 => 10),
+				'hidden_users'			=> array(6 => 6, 7 => 7, 10 => 10),
+				'total_online'			=> 7,
+				'visible_online'		=> 2,
+				'hidden_online'			=> 3,
+				'guests_online'			=> 2,
+			)),
+			array(1, false, array(
+				'online_users'			=> array(3 => 3, 7 => 7),
+				'hidden_users'			=> array(7 => 7),
+				'total_online'			=> 2,
+				'visible_online'		=> 1,
+				'hidden_online'			=> 1,
+				'guests_online'			=> 0,
+			)),
+			array(1, true, array(
+				'online_users'			=> array(3 => 3, 7 => 7),
+				'hidden_users'			=> array(7 => 7),
+				'total_online'			=> 3,
+				'visible_online'		=> 1,
+				'hidden_online'			=> 1,
+				'guests_online'			=> 1,
+			)),
+			array(2, false, array(
+				'online_users'			=> array(),
+				'hidden_users'			=> array(),
+				'total_online'			=> 0,
+				'visible_online'		=> 0,
+				'hidden_online'			=> 0,
+				'guests_online'			=> 0,
+			)),
+			array(2, true, array(
+				'online_users'			=> array(),
+				'hidden_users'			=> array(),
+				'total_online'			=> 0,
+				'visible_online'		=> 0,
+				'hidden_online'			=> 0,
+				'guests_online'			=> 0,
+			)),
+		);
+	}
+
+	/**
+	* @dataProvider obtain_users_online_data
+	*/
+	public function test_obtain_users_online($forum_id, $display_guests, $expected)
+	{
+		$this->db->sql_query('DELETE FROM phpbb_sessions');
+
+		global $config;
+		$config['load_online_guests'] = $display_guests;
+
+		$time = time();
+		$this->create_guest_sessions($time);
+		$this->create_user_sessions($time);
+		$this->assertEquals($expected, obtain_users_online($forum_id));
+	}
+
+	static public function obtain_users_online_string_data()
+	{
+		return array(
+			array(0, false, array(
+				'online_userlist'	=> 'REGISTERED_USERS 2, 3',
+				'l_online_users'	=> 'ONLINE_USERS_TOTAL 5REG_USERS_TOTAL_AND 2HIDDEN_USERS_TOTAL 3',
+			)),
+			array(0, true, array(
+				'online_userlist'	=> 'REGISTERED_USERS 2, 3',
+				'l_online_users'	=> 'ONLINE_USERS_TOTAL 7REG_USERS_TOTAL 2HIDDEN_USERS_TOTAL_AND 3GUEST_USERS_TOTAL 2',
+			)),
+			array(1, false, array(
+				'online_userlist'	=> 'BROWSING_FORUM 3',
+				'l_online_users'	=> 'ONLINE_USERS_TOTAL 2REG_USER_TOTAL_AND 1HIDDEN_USER_TOTAL 1',
+			)),
+			array(1, true, array(
+				'online_userlist'	=> 'BROWSING_FORUM_GUEST 3 1',
+				'l_online_users'	=> 'ONLINE_USERS_TOTAL 3REG_USER_TOTAL 1HIDDEN_USER_TOTAL_AND 1GUEST_USER_TOTAL 1',
+			)),
+			array(2, false, array(
+				'online_userlist'	=> 'BROWSING_FORUM NO_ONLINE_USERS',
+				'l_online_users'	=> 'ONLINE_USERS_ZERO_TOTAL 0REG_USERS_ZERO_TOTAL_AND 0HIDDEN_USERS_ZERO_TOTAL 0',
+			)),
+			array(2, true, array(
+				'online_userlist'	=> 'BROWSING_FORUM_GUESTS NO_ONLINE_USERS 0',
+				'l_online_users'	=> 'ONLINE_USERS_ZERO_TOTAL 0REG_USERS_ZERO_TOTAL 0HIDDEN_USERS_ZERO_TOTAL_AND 0GUEST_USERS_ZERO_TOTAL 0',
+			)),
+		);
+	}
+
+	/**
+	* @dataProvider obtain_users_online_string_data
+	*/
+	public function test_obtain_users_online_string($forum_id, $display_guests, $expected)
+	{
+		$this->db->sql_query('DELETE FROM phpbb_sessions');
+
+		global $config, $user, $auth;
+		$config['load_online_guests'] = $display_guests;
+		$user->lang = $this->load_language();
+		$auth = $this->getMock('auth');
+		$acl_get_map = array(
+			array('u_viewonline', true),
+		);
+		$auth->expects($this->any())
+			->method('acl_get')
+			->with($this->stringContains('_'),
+				$this->anything())
+			->will($this->returnValueMap($acl_get_map));
+
+		$time = time();
+		$this->create_guest_sessions($time);
+		$this->create_user_sessions($time);
+
+		$online_users = obtain_users_online($forum_id);
+		$this->assertEquals($expected, obtain_users_online_string($online_users, $forum_id));
+	}
+
+	protected function create_guest_sessions($time)
+	{
+		$this->add_session(1, '0001', '192.168.0.1', 0, true, $time);
+		$this->add_session(1, '0002', '192.168.0.2', 1, true, $time);
+		$this->add_session(1, '0003', '192.168.0.3', 0, true, $time, 10);
+		$this->add_session(1, '0004', '192.168.0.4', 1, true, $time, 10);
+	}
+
+	protected function create_user_sessions($time)
+	{
+		$this->add_session(2, '0005', '192.168.0.5', 0, true, $time);
+		$this->add_session(3, '0006', '192.168.0.6', 1, true, $time);
+		$this->add_session(4, '0007', '192.168.0.7', 0, true, $time, 10);
+		$this->add_session(5, '0008', '192.168.0.8', 1, true, $time, 10);
+		$this->add_session(6, '0005', '192.168.0.9', 0, false, $time);
+		$this->add_session(7, '0006', '192.168.0.10', 1, false, $time);
+		$this->add_session(8, '0007', '192.168.0.11', 0, false, $time, 10);
+		$this->add_session(9, '0008', '192.168.0.12', 1, false, $time, 10);
+		$this->add_session(10, '009', '192.168.0.13', 0, false, $time);
+	}
+
+	protected function add_session($user_id, $session_id, $user_ip, $forum_id, $view_online, $time, $time_delta = 0)
+	{
+		$sql_ary = array(
+			'session_id'			=> $user_id . '_' . $forum_id . '_session00000000000000000' . $session_id,
+			'session_user_id'		=> $user_id,
+			'session_ip'			=> $user_ip,
+			'session_forum_id'		=> $forum_id,
+			'session_time'			=> $time - $time_delta * 60,
+			'session_viewonline'	=> $view_online,
+		);
+		$this->db->sql_query('INSERT INTO phpbb_sessions ' . $this->db->sql_build_array('INSERT', $sql_ary));
+	}
+
+	protected function load_language()
+	{
+		$lang = array(
+			'NO_ONLINE_USERS'	=> 'NO_ONLINE_USERS',
+			'REGISTERED_USERS'	=> 'REGISTERED_USERS',
+			'BROWSING_FORUM'	=> 'BROWSING_FORUM %s',
+			'BROWSING_FORUM_GUEST'	=> 'BROWSING_FORUM_GUEST %s %d',
+			'BROWSING_FORUM_GUESTS'	=> 'BROWSING_FORUM_GUESTS %s %d',
+		);
+		$vars_online = array('ONLINE', 'REG', 'HIDDEN', 'GUEST');
+		foreach ($vars_online as $online)
+		{
+			$lang = array_merge($lang, array(
+				$online . '_USERS_ZERO_TOTAL'	=> $online . '_USERS_ZERO_TOTAL %d',
+				$online . '_USER_TOTAL'			=> $online . '_USER_TOTAL %d',
+				$online . '_USERS_TOTAL'		=> $online . '_USERS_TOTAL %d',
+				$online . '_USERS_ZERO_TOTAL_AND'	=> $online . '_USERS_ZERO_TOTAL_AND %d',
+				$online . '_USER_TOTAL_AND'			=> $online . '_USER_TOTAL_AND %d',
+				$online . '_USERS_TOTAL_AND'		=> $online . '_USERS_TOTAL_AND %d',
+			));
+		}
+		return $lang;
+	}
+}
diff --git a/tests/test_framework/phpbb_database_test_case.php b/tests/test_framework/phpbb_database_test_case.php
index 429bb92bf1..28d3a716f0 100644
--- a/tests/test_framework/phpbb_database_test_case.php
+++ b/tests/test_framework/phpbb_database_test_case.php
@@ -11,6 +11,8 @@ abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_Test
 {
 	static private $already_connected;
 
+	private $db_connections;
+
 	protected $test_case_helpers;
 
 	protected $fixture_xml_data;
@@ -28,6 +30,22 @@ abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_Test
 
 			'phpbb_database_test_case' => array('already_connected'),
 		);
+
+		$this->db_connections = array();
+	}
+
+	protected function tearDown()
+	{
+		parent::tearDown();
+
+		// Close all database connections from this test
+		if (!empty($this->db_connections))
+		{
+			foreach ($this->db_connections as $db)
+			{
+				$db->sql_close();
+			}
+		}
 	}
 
 	protected function setUp()
@@ -44,6 +62,21 @@ abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_Test
 		}
 	}
 
+	/**
+	* Performs synchronisations for a given table/column set on the database
+	*
+	* @param	array	$table_column_map		Information about the tables/columns to synchronise
+	*
+	* @return null
+	*/
+	protected function database_synchronisation($table_column_map)
+	{
+		$config = $this->get_database_config();
+		$manager = $this->create_connection_manager($config);
+		$manager->connect();
+		$manager->database_synchronisation($table_column_map);
+	}
+
 	public function createXMLDataSet($path)
 	{
 		$db_config = $this->get_database_config();
@@ -123,6 +156,8 @@ abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_Test
 		$db = new $dbal();
 		$db->sql_connect($config['dbhost'], $config['dbuser'], $config['dbpasswd'], $config['dbname'], $config['dbport']);
 
+		$this->db_connections[] = $db;
+
 		return $db;
 	}
 
diff --git a/tests/test_framework/phpbb_database_test_connection_manager.php b/tests/test_framework/phpbb_database_test_connection_manager.php
index bcd52b1794..30f1fa6589 100644
--- a/tests/test_framework/phpbb_database_test_connection_manager.php
+++ b/tests/test_framework/phpbb_database_test_connection_manager.php
@@ -481,11 +481,32 @@ class phpbb_database_test_connection_manager
 	*/
 	public function post_setup_synchronisation($xml_data_set)
 	{
+		$table_names = $xml_data_set->getTableNames();
+
+		$tables = array();
+		foreach ($table_names as $table)
+		{
+			$tables[$table] = $xml_data_set->getTableMetaData($table)->getColumns();
+		}
+
+		$this->database_synchronisation($tables);
+	}
+
+	/**
+	* Performs synchronisations on the database after a fixture has been loaded
+	*
+	* @param	array	$table_column_map		Array of tables/columns to synchronise
+	*											array(table1 => array(column1, column2))
+	*
+	* @return null
+	*/
+	public function database_synchronisation($table_column_map)
+	{
 		$this->ensure_connected(__METHOD__);
 		$queries = array();
 
-		// Get escaped versions of the table names used in the fixture
-		$table_names = array_map(array($this->pdo, 'PDO::quote'), $xml_data_set->getTableNames());
+		// Get escaped versions of the table names to synchronise
+		$table_names = array_map(array($this->pdo, 'PDO::quote'), array_keys($table_column_map));
 
 		switch ($this->config['dbms'])
 		{
@@ -542,7 +563,7 @@ class phpbb_database_test_connection_manager
 				while ($row = $result->fetch(PDO::FETCH_ASSOC))
 				{
 					// Get the columns used in the fixture for this table
-					$column_names = $xml_data_set->getTableMetaData($row['table_name'])->getColumns();
+					$column_names = $table_column_map[$row['table_name']];
 
 					// Skip sequences that weren't specified in the fixture
 					if (!in_array($row['column_name'], $column_names))
diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php
index b1352b247e..651ab013c7 100644
--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -14,8 +14,9 @@ require_once __DIR__ . '/../../phpBB/includes/cache.php';
 
 class phpbb_functional_test_case extends phpbb_test_case
 {
-	protected $client;
-	protected $root_url;
+	static protected $client;
+	static protected $cookieJar;
+	static protected $root_url;
 
 	protected $cache = null;
 	protected $db = null;
@@ -40,6 +41,7 @@ class phpbb_functional_test_case extends phpbb_test_case
 		parent::setUpBeforeClass();
 
 		self::$config = phpbb_test_case_helpers::get_test_config();
+		self::$root_url = self::$config['phpbb_functional_url'];
 
 		if (!isset(self::$config['phpbb_functional_url']))
 		{
@@ -59,12 +61,12 @@ class phpbb_functional_test_case extends phpbb_test_case
 
 		$this->bootstrap();
 
-		$this->cookieJar = new CookieJar;
-		$this->client = new Goutte\Client(array(), null, $this->cookieJar);
+		self::$cookieJar = new CookieJar;
+		self::$client = new Goutte\Client(array(), null, self::$cookieJar);
 		// Reset the curl handle because it is 0 at this point and not a valid
 		// resource
-		$this->client->getClient()->getCurlMulti()->reset(true);
-		$this->root_url = self::$config['phpbb_functional_url'];
+		self::$client->getClient()->getCurlMulti()->reset(true);
+
 		// Clear the language array so that things
 		// that were added in other tests are gone
 		$this->lang = array();
@@ -72,9 +74,55 @@ class phpbb_functional_test_case extends phpbb_test_case
 		$this->purge_cache();
 	}
 
-	public function request($method, $path)
+	/**
+	* Perform a request to page
+	*
+	* @param string	$method		HTTP Method
+	* @param string	$path		Page path, relative from phpBB root path
+	* @param array $form_data	An array of form field values
+	* @param bool	$assert_response_html	Should we perform standard assertions for a normal html page
+	* @return Symfony\Component\DomCrawler\Crawler
+	*/
+	static public function request($method, $path, $form_data = array(), $assert_response_html = true)
+	{
+		$crawler = self::$client->request($method, self::$root_url . $path, $form_data);
+
+		if ($assert_response_html)
+		{
+			self::assert_response_html();
+		}
+
+		return $crawler;
+	}
+
+	/**
+	* Submits a form
+	*
+	* @param Symfony\Component\DomCrawler\Form $form A Form instance
+	* @param array $values An array of form field values
+	* @param bool	$assert_response_html	Should we perform standard assertions for a normal html page
+	* @return Symfony\Component\DomCrawler\Crawler
+	*/
+	static public function submit(Symfony\Component\DomCrawler\Form $form, array $values = array(), $assert_response_html = true)
+	{
+		$crawler = self::$client->submit($form, $values);
+
+		if ($assert_response_html)
+		{
+			self::assert_response_html();
+		}
+
+		return $crawler;
+	}
+
+	/**
+	* Get Client Content
+	*
+	* @return string HTML page
+	*/
+	static public function get_content()
 	{
-		return $this->client->request($method, $this->root_url . $path);
+		return self::$client->getResponse()->getContent();
 	}
 
 	// bootstrap, called after board is set up
@@ -148,28 +196,76 @@ class phpbb_functional_test_case extends phpbb_test_case
 			}
 		}
 
-		// begin data
-		$data = array();
+		self::$cookieJar = new CookieJar;
+		self::$client = new Goutte\Client(array(), null, self::$cookieJar);
+		// Set client manually so we can increase the cURL timeout
+		self::$client->setClient(new Guzzle\Http\Client('', array(
+			Guzzle\Http\Client::DISABLE_REDIRECTS	=> true,
+			'curl.options'	=> array(
+				CURLOPT_TIMEOUT	=> 120,
+			),
+		)));
 
-		$data = array_merge($data, self::$config);
+		// Reset the curl handle because it is 0 at this point and not a valid
+		// resource
+		self::$client->getClient()->getCurlMulti()->reset(true);
 
-		$data = array_merge($data, array(
+		$parseURL = parse_url(self::$config['phpbb_functional_url']);
+
+		$crawler = self::request('GET', 'install/index.php?mode=install');
+		self::assertContains('Welcome to Installation', $crawler->filter('#main')->text());
+		$form = $crawler->selectButton('submit')->form();
+
+		$crawler = self::submit($form);
+		self::assertContains('Installation compatibility', $crawler->filter('#main')->text());
+		$form = $crawler->selectButton('submit')->form();
+
+		$crawler = self::submit($form);
+		self::assertContains('Database configuration', $crawler->filter('#main')->text());
+		$form = $crawler->selectButton('submit')->form(array(
+			// Installer uses 3.0-style dbms name
+			'dbms'			=> str_replace('phpbb_db_driver_', '',  self::$config['dbms']),
+			'dbhost'		=> self::$config['dbhost'],
+			'dbport'		=> self::$config['dbport'],
+			'dbname'		=> self::$config['dbname'],
+			'dbuser'		=> self::$config['dbuser'],
+			'dbpasswd'		=> self::$config['dbpasswd'],
+			'table_prefix'	=> self::$config['table_prefix'],
+		));
+
+		$crawler = self::submit($form);
+		self::assertContains('Successful connection', $crawler->filter('#main')->text());
+		$form = $crawler->selectButton('submit')->form();
+
+		$crawler = self::submit($form);
+		self::assertContains('Administrator configuration', $crawler->filter('#main')->text());
+		$form = $crawler->selectButton('submit')->form(array(
 			'default_lang'	=> 'en',
 			'admin_name'	=> 'admin',
-			'admin_pass1'	=> 'admin',
-			'admin_pass2'	=> 'admin',
-			'board_email'	=> 'nobody@example.com',
+			'admin_pass1'	=> 'adminadmin',
+			'admin_pass2'	=> 'adminadmin',
+			'board_email1'	=> 'nobody@example.com',
+			'board_email2'	=> 'nobody@example.com',
 		));
 
-		$parseURL = parse_url(self::$config['phpbb_functional_url']);
-
-		$data = array_merge($data, array(
-			'email_enable'		=> false,
-			'smtp_delivery'		=> false,
-			'smtp_host'		=> '',
-			'smtp_auth'		=> '',
-			'smtp_user'		=> '',
-			'smtp_pass'		=> '',
+		$crawler = self::submit($form);
+		self::assertContains('Tests passed', $crawler->filter('#main')->text());
+		$form = $crawler->selectButton('submit')->form();
+
+		$crawler = self::submit($form);
+		self::assertContains('The configuration file has been written.', $crawler->filter('#main')->text());
+		file_put_contents($phpbb_root_path . "config.$phpEx", phpbb_create_config_file_data(self::$config, self::$config['dbms'], array(), true, true));
+		$form = $crawler->selectButton('submit')->form();
+
+		$crawler = self::submit($form);
+		self::assertContains('The settings on this page are only necessary to set if you know that you require something different from the default.', $crawler->filter('#main')->text());
+		$form = $crawler->selectButton('submit')->form(array(
+			'email_enable'		=> true,
+			'smtp_delivery'		=> true,
+			'smtp_host'			=> 'nxdomain.phpbb.com',
+			'smtp_auth'			=> 'PLAIN',
+			'smtp_user'			=> 'nxuser',
+			'smtp_pass'			=> 'nxpass',
 			'cookie_secure'		=> false,
 			'force_server_vars'	=> false,
 			'server_protocol'	=> $parseURL['scheme'] . '://',
@@ -177,46 +273,15 @@ class phpbb_functional_test_case extends phpbb_test_case
 			'server_port'		=> isset($parseURL['port']) ? (int) $parseURL['port'] : 80,
 			'script_path'		=> $parseURL['path'],
 		));
-		// end data
-
-		$content = self::do_request('install');
-		self::assertNotSame(false, $content);
-		self::assertContains('Welcome to Installation', $content);
-
-		$content = self::do_request('create_table', $data);
-		self::assertNotSame(false, $content);
-		self::assertContains('The database tables used by phpBB', $content);
-		// 3.0 or 3.1
-		self::assertContains('have been created and populated with some initial data.', $content);
-
-		$content = self::do_request('config_file', $data);
-		self::assertNotSame(false, $content);
-		self::assertContains('Configuration file', $content);
-		file_put_contents($phpbb_root_path . "config.$phpEx", phpbb_create_config_file_data($data, self::$config['dbms'], array(), true, true));
-
-		$content = self::do_request('final', $data);
-		self::assertNotSame(false, $content);
-		self::assertContains('You have successfully installed', $content);
-		copy($phpbb_root_path . "config.$phpEx", $phpbb_root_path . "config_test.$phpEx");
-	}
-
-	static private function do_request($sub, $post_data = null)
-	{
-		$context = null;
 
-		if ($post_data)
-		{
-			$context = stream_context_create(array(
-				'http' => array(
-					'method'	=> 'POST',
-					'header'	=> 'Content-Type: application/x-www-form-urlencoded',
-					'content'	=> http_build_query($post_data),
-					'ignore_errors' => true,
-				),
-			));
-		}
+		$crawler = self::submit($form);
+		self::assertContains('The database tables used by phpBB', $crawler->filter('#main')->text());
+		self::assertContains('have been created and populated with some initial data.', $crawler->filter('#main')->text());
+		$form = $crawler->selectButton('submit')->form();
 
-		return file_get_contents(self::$config['phpbb_functional_url'] . 'install/index.php?mode=install&sub=' . $sub, false, $context);
+		$crawler = self::submit($form);
+		self::assertContains('You have successfully installed', $crawler->text());
+		copy($phpbb_root_path . "config.$phpEx", $phpbb_root_path . "config_test.$phpEx");
 	}
 
 	static private function recreate_database($config)
@@ -270,7 +335,7 @@ class phpbb_functional_test_case extends phpbb_test_case
 			'user_lang' => 'en',
 			'user_timezone' => 0,
 			'user_dateformat' => '',
-			'user_password' => phpbb_hash($username),
+			'user_password' => phpbb_hash($username . $username),
 		);
 		return user_add($user_row);
 	}
@@ -279,15 +344,14 @@ class phpbb_functional_test_case extends phpbb_test_case
 	{
 		$this->add_lang('ucp');
 
-		$crawler = $this->request('GET', 'ucp.php');
+		$crawler = self::request('GET', 'ucp.php');
 		$this->assertContains($this->lang('LOGIN_EXPLAIN_UCP'), $crawler->filter('html')->text());
 
 		$form = $crawler->selectButton($this->lang('LOGIN'))->form();
-		$crawler = $this->client->submit($form, array('username' => $username, 'password' => $username));
-		$this->assert_response_success();
+		$crawler = self::submit($form, array('username' => $username, 'password' => $username . $username));
 		$this->assertContains($this->lang('LOGIN_REDIRECT'), $crawler->filter('html')->text());
 
-		$cookies = $this->cookieJar->all();
+		$cookies = self::$cookieJar->all();
 
 		// The session id is stored in a cookie that ends with _sid - we assume there is only one such cookie
 		foreach ($cookies as $cookie);
@@ -314,7 +378,7 @@ class phpbb_functional_test_case extends phpbb_test_case
 			return;
 		}
 
-		$crawler = $this->request('GET', 'adm/index.php?sid=' . $this->sid);
+		$crawler = self::request('GET', 'adm/index.php?sid=' . $this->sid);
 		$this->assertContains($this->lang('LOGIN_ADMIN_CONFIRM'), $crawler->filter('html')->text());
 
 		$form = $crawler->selectButton($this->lang('LOGIN'))->form();
@@ -323,11 +387,10 @@ class phpbb_functional_test_case extends phpbb_test_case
 		{
 			if (strpos($field, 'password_') === 0)
 			{
-				$crawler = $this->client->submit($form, array('username' => $username, $field => $username));
-				$this->assert_response_success();
+				$crawler = self::submit($form, array('username' => $username, $field => $username . $username));
 				$this->assertContains($this->lang('LOGIN_ADMIN_SUCCESS'), $crawler->filter('html')->text());
 
-				$cookies = $this->cookieJar->all();
+				$cookies = self::$cookieJar->all();
 
 				// The session id is stored in a cookie that ends with _sid - we assume there is only one such cookie
 				foreach ($cookies as $cookie);
@@ -381,20 +444,36 @@ class phpbb_functional_test_case extends phpbb_test_case
 	}
 
 	/**
+	* Perform some basic assertions for the 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_html($status_code = 200)
+	{
+		if ($status_code !== false)
+		{
+			self::assert_response_status_code($status_code);
+		}
+
+		// Any output before the doc type means there was an error
+		$content = self::$client->getResponse()->getContent();
+		self::assertStringStartsWith('<!DOCTYPE', trim($content), 'Output found before DOCTYPE specification.');
+	}
+
+	/**
 	* Heuristic function to check that the response is success.
 	*
 	* When php decides to die with a fatal error, it still sends 200 OK
 	* status code. This assertion tries to catch that.
 	*
+	* @param int $status_code	Expected status code
 	* @return null
 	*/
-	public function assert_response_success()
+	static public function assert_response_status_code($status_code = 200)
 	{
-		$this->assertEquals(200, $this->client->getResponse()->getStatus());
-		$content = $this->client->getResponse()->getContent();
-		$this->assertNotContains('Fatal error:', $content);
-		$this->assertNotContains('Notice:', $content);
-		$this->assertNotContains('Warning:', $content);
-		$this->assertNotContains('[phpBB Debug]', $content);
+		self::assertEquals($status_code, self::$client->getResponse()->getStatus());
 	}
 }