From a5f1dc67b9a29b80f584ca753260fb8dbe459a43 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 3 Dec 2013 10:02:53 +0100
Subject: [PATCH 1/2] [ticket/12026] Remove root path, its prepended later

PHPBB3-12026
---
 phpBB/includes/functions_module.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/phpBB/includes/functions_module.php b/phpBB/includes/functions_module.php
index 0d0f79a16d..e1259eba12 100644
--- a/phpBB/includes/functions_module.php
+++ b/phpBB/includes/functions_module.php
@@ -533,9 +533,9 @@ class p_master
 			// 0 vendor, 1 extension name, ...
 			if (isset($module_dir[1]))
 			{
-				$module_style_dir =  $phpbb_root_path . 'ext/' . $module_dir[0] . '/' . $module_dir[1] . '/styles';
+				$module_style_dir = 'ext/' . $module_dir[0] . '/' . $module_dir[1] . '/styles';
 
-				if (is_dir($module_style_dir))
+				if (is_dir($phpbb_root_path . $module_style_dir))
 				{
 					$template->set_style(array($module_style_dir, 'styles'));
 				}

From 9fbeae3e0ca373f98a6102266f2bb75653e5211a Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 3 Dec 2013 17:57:34 +0100
Subject: [PATCH 2/2] [ticket/12026] Add functional test for ucp extension
 module

PHPBB3-12026
---
 tests/functional/extension_module_test.php    | 45 ++++++++++++++++---
 .../bar/styles/prosilver/template/foobar.html |  3 ++
 .../fixtures/ext/foo/bar/ucp/main_info.php    | 26 +++++++++++
 .../fixtures/ext/foo/bar/ucp/main_module.php  | 22 +++++++++
 4 files changed, 91 insertions(+), 5 deletions(-)
 create mode 100644 tests/functional/fixtures/ext/foo/bar/styles/prosilver/template/foobar.html
 create mode 100644 tests/functional/fixtures/ext/foo/bar/ucp/main_info.php
 create mode 100644 tests/functional/fixtures/ext/foo/bar/ucp/main_module.php

diff --git a/tests/functional/extension_module_test.php b/tests/functional/extension_module_test.php
index 090cd38daf..ba025d582e 100644
--- a/tests/functional/extension_module_test.php
+++ b/tests/functional/extension_module_test.php
@@ -80,18 +80,53 @@ class phpbb_functional_extension_module_test extends phpbb_functional_test_case
 		);
 		$modules->update_module_data($module_data, true);
 
+		$parent_data = array(
+			'module_basename'	=> '',
+			'module_enabled'	=> 1,
+			'module_display'	=> 1,
+			'parent_id'			=> 0,
+			'module_class'		=> 'ucp',
+			'module_langname'	=> 'UCP_FOOBAR_TITLE',
+			'module_mode'		=> '',
+			'module_auth'		=> '',
+		);
+		$modules->update_module_data($parent_data, true);
+
+		$module_data = array(
+			'module_basename'	=> 'foo\\bar\\ucp\\main_module',
+			'module_enabled'	=> 1,
+			'module_display'	=> 1,
+			'parent_id'			=> $parent_data['module_id'],
+			'module_class'		=> 'ucp',
+			'module_langname'	=> 'UCP_FOOBAR_TITLE',
+			'module_mode'		=> 'mode',
+			'module_auth'		=> '',
+		);
+		$modules->update_module_data($module_data, true);
+
 		$this->purge_cache();
 	}
 
-	/**
-	* Check a controller for extension foo/bar.
-	*/
-	public function test_foo_bar()
+	public function test_acp()
 	{
 		$this->login();
 		$this->admin_login();
+
 		$crawler = self::request('GET', 'adm/index.php?i=foo%5cbar%5cacp%5cmain_module&mode=mode&sid=' . $this->sid);
-		$this->assertContains("Bertie rulez!", $crawler->filter('#main')->text());
+		$this->assertContains('Bertie rulez!', $crawler->filter('#main')->text());
+	}
+
+	public function test_ucp()
+	{
+		$this->login();
+
+		$crawler = self::request('GET', 'ucp.php?sid=' . $this->sid);
+		$this->assertContains('UCP_FOOBAR_TITLE', $crawler->filter('#tabs')->text());
+
+		$link = $crawler->selectLink('UCP_FOOBAR_TITLE')->link()->getUri();
+		$crawler = self::request('GET', substr($link, strpos($link, 'ucp.')));
+		$this->assertContains('UCP Extension Template Test Passed!', $crawler->filter('#content')->text());
+
 		$this->phpbb_extension_manager->purge('foo/bar');
 	}
 }
diff --git a/tests/functional/fixtures/ext/foo/bar/styles/prosilver/template/foobar.html b/tests/functional/fixtures/ext/foo/bar/styles/prosilver/template/foobar.html
new file mode 100644
index 0000000000..cbded623f4
--- /dev/null
+++ b/tests/functional/fixtures/ext/foo/bar/styles/prosilver/template/foobar.html
@@ -0,0 +1,3 @@
+<!-- INCLUDE overall_header.html -->
+<div id="content">UCP Extension Template Test Passed!</div>
+<!-- INCLUDE overall_footer.html -->
diff --git a/tests/functional/fixtures/ext/foo/bar/ucp/main_info.php b/tests/functional/fixtures/ext/foo/bar/ucp/main_info.php
new file mode 100644
index 0000000000..2ba37f3050
--- /dev/null
+++ b/tests/functional/fixtures/ext/foo/bar/ucp/main_info.php
@@ -0,0 +1,26 @@
+<?php
+
+/**
+*
+* @package testing
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+namespace foo\bar\ucp;
+
+class main_info
+{
+	function module()
+	{
+		return array(
+			'filename'	=> '\foo\bar\ucp\main_module',
+			'title'		=> 'ACP_FOOBAR_TITLE',
+			'version'	=> '1.0.0',
+			'modes'		=> array(
+				'mode'		=> array('title' => 'ACP_FOOBAR_MODE', 'auth' => '', 'cat' => array('ACP_FOOBAR_TITLE')),
+			),
+		);
+	}
+}
diff --git a/tests/functional/fixtures/ext/foo/bar/ucp/main_module.php b/tests/functional/fixtures/ext/foo/bar/ucp/main_module.php
new file mode 100644
index 0000000000..cd3dacc9db
--- /dev/null
+++ b/tests/functional/fixtures/ext/foo/bar/ucp/main_module.php
@@ -0,0 +1,22 @@
+<?php
+
+/**
+*
+* @package testing
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+namespace foo\bar\ucp;
+
+class main_module
+{
+	var $u_action;
+
+	function main($id, $mode)
+	{
+		$this->tpl_name = 'foobar';
+		$this->page_title = 'Bertie';
+	}
+}