From 87832d06cca520e27c5dbed1c36ab9c12240ae3d Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sun, 1 May 2011 04:03:06 -0400
Subject: [feature/template-engine] Delete template class, use phpbb_template
 instead.

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

(limited to 'phpBB/common.php')

diff --git a/phpBB/common.php b/phpBB/common.php
index ccd043ba70..a6ae7dff75 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -209,7 +209,7 @@ $class_loader->set_cache($cache->get_driver());
 $request	= new phpbb_request();
 $user		= new user();
 $auth		= new auth();
-$template	= new template();
+$template	= new phpbb_template();
 $db			= new $sql_db();
 
 // make sure request_var uses this request instance
-- 
cgit v1.2.1


From 5a4a1e3c25b0e10a3ce008dc2eded29decb0f469 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Wed, 11 May 2011 03:51:34 +0200
Subject: [ticket/10126] Use binary "and not" instead of binary "xor" in
 error_reporting.

Make what we want to achieve clear by using "and not" instead of "xor".

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

(limited to 'phpBB/common.php')

diff --git a/phpBB/common.php b/phpBB/common.php
index ae174c8441..ceafdbd3bd 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -24,7 +24,7 @@ if (!defined('E_DEPRECATED'))
 {
 	define('E_DEPRECATED', 8192);
 }
-error_reporting(E_ALL ^ E_NOTICE ^ E_DEPRECATED);
+error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED);
 
 /*
 * Remove variables created by register_globals from the global scope
-- 
cgit v1.2.1


From d2ac05aa74d3a1c9723be41a4c0ffe86542f223f Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Thu, 12 May 2011 18:08:36 -0400
Subject: [feature/template-engine] Replaced globals with dependency injection.

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

(limited to 'phpBB/common.php')

diff --git a/phpBB/common.php b/phpBB/common.php
index a6ae7dff75..46f78a7926 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -209,7 +209,6 @@ $class_loader->set_cache($cache->get_driver());
 $request	= new phpbb_request();
 $user		= new user();
 $auth		= new auth();
-$template	= new phpbb_template();
 $db			= new $sql_db();
 
 // make sure request_var uses this request instance
@@ -226,6 +225,8 @@ $config = new phpbb_config_db($db, $cache->get_driver(), CONFIG_TABLE);
 set_config(null, null, null, $config);
 set_config_count(null, null, null, $config);
 
+$template	= new phpbb_template($phpbb_root_path, $phpEx, $config, $user);
+
 // Add own hook handler
 require($phpbb_root_path . 'includes/hooks/index.' . $phpEx);
 $phpbb_hook = new phpbb_hook(array('exit_handler', 'phpbb_user_session_handler', 'append_sid', array('template', 'display')));
-- 
cgit v1.2.1


From 57eb02bf2c62c665e8b0050515aa78684c8dd452 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Fri, 3 Jun 2011 02:30:36 +0200
Subject: [ticket/10149] Skip foreach over GLOBALS cookie values if cookie is
 scalar

PHPBB3-10149
---
 phpBB/common.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'phpBB/common.php')

diff --git a/phpBB/common.php b/phpBB/common.php
index ceafdbd3bd..a176a45c38 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -69,7 +69,7 @@ function deregister_globals()
 	{
 		if (isset($not_unset[$varname]))
 		{
-			// Hacking attempt. No point in continuing unless it's a COOKIE
+			// Hacking attempt. No point in continuing unless it's a COOKIE (so a cookie called GLOBALS doesn't lock users out completely)
 			if ($varname !== 'GLOBALS' || isset($_GET['GLOBALS']) || isset($_POST['GLOBALS']) || isset($_SERVER['GLOBALS']) || isset($_SESSION['GLOBALS']) || isset($_ENV['GLOBALS']) || isset($_FILES['GLOBALS']))
 			{
 				exit;
@@ -79,6 +79,11 @@ function deregister_globals()
 				$cookie = &$_COOKIE;
 				while (isset($cookie['GLOBALS']))
 				{
+					if (!is_array($cookie['GLOBALS']))
+					{
+						break;
+					}
+
 					foreach ($cookie['GLOBALS'] as $registered_var => $value)
 					{
 						if (!isset($not_unset[$registered_var]))
-- 
cgit v1.2.1


From f8eb15471488fe5f84669a9abbc2fc3a705903de Mon Sep 17 00:00:00 2001
From: Yuriy Rusko <github@rusko.net>
Date: Tue, 14 Jun 2011 06:11:35 -0400
Subject: [ticket/10218] Moving global deregistration, etc. to startup.php

Because startup.php deletes all variables, the constants in
database_update are used to preserve settings at the top.

PHPBB3-10218
---
 phpBB/common.php | 107 +------------------------------------------------------
 1 file changed, 1 insertion(+), 106 deletions(-)

(limited to 'phpBB/common.php')

diff --git a/phpBB/common.php b/phpBB/common.php
index a176a45c38..491addc5e0 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -16,112 +16,7 @@ if (!defined('IN_PHPBB'))
 	exit;
 }
 
-$starttime = explode(' ', microtime());
-$starttime = $starttime[1] + $starttime[0];
-
-// Report all errors, except notices and deprecation messages
-if (!defined('E_DEPRECATED'))
-{
-	define('E_DEPRECATED', 8192);
-}
-error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED);
-
-/*
-* Remove variables created by register_globals from the global scope
-* Thanks to Matt Kavanagh
-*/
-function deregister_globals()
-{
-	$not_unset = array(
-		'GLOBALS'	=> true,
-		'_GET'		=> true,
-		'_POST'		=> true,
-		'_COOKIE'	=> true,
-		'_REQUEST'	=> true,
-		'_SERVER'	=> true,
-		'_SESSION'	=> true,
-		'_ENV'		=> true,
-		'_FILES'	=> true,
-		'phpEx'		=> true,
-		'phpbb_root_path'	=> true
-	);
-
-	// Not only will array_merge and array_keys give a warning if
-	// a parameter is not an array, array_merge will actually fail.
-	// So we check if _SESSION has been initialised.
-	if (!isset($_SESSION) || !is_array($_SESSION))
-	{
-		$_SESSION = array();
-	}
-
-	// Merge all into one extremely huge array; unset this later
-	$input = array_merge(
-		array_keys($_GET),
-		array_keys($_POST),
-		array_keys($_COOKIE),
-		array_keys($_SERVER),
-		array_keys($_SESSION),
-		array_keys($_ENV),
-		array_keys($_FILES)
-	);
-
-	foreach ($input as $varname)
-	{
-		if (isset($not_unset[$varname]))
-		{
-			// Hacking attempt. No point in continuing unless it's a COOKIE (so a cookie called GLOBALS doesn't lock users out completely)
-			if ($varname !== 'GLOBALS' || isset($_GET['GLOBALS']) || isset($_POST['GLOBALS']) || isset($_SERVER['GLOBALS']) || isset($_SESSION['GLOBALS']) || isset($_ENV['GLOBALS']) || isset($_FILES['GLOBALS']))
-			{
-				exit;
-			}
-			else
-			{
-				$cookie = &$_COOKIE;
-				while (isset($cookie['GLOBALS']))
-				{
-					if (!is_array($cookie['GLOBALS']))
-					{
-						break;
-					}
-
-					foreach ($cookie['GLOBALS'] as $registered_var => $value)
-					{
-						if (!isset($not_unset[$registered_var]))
-						{
-							unset($GLOBALS[$registered_var]);
-						}
-					}
-					$cookie = &$cookie['GLOBALS'];
-				}
-			}
-		}
-
-		unset($GLOBALS[$varname]);
-	}
-
-	unset($input);
-}
-
-// If we are on PHP >= 6.0.0 we do not need some code
-if (version_compare(PHP_VERSION, '6.0.0-dev', '>='))
-{
-	/**
-	* @ignore
-	*/
-	define('STRIP', false);
-}
-else
-{
-	@set_magic_quotes_runtime(0);
-
-	// Be paranoid with passed vars
-	if (@ini_get('register_globals') == '1' || strtolower(@ini_get('register_globals')) == 'on' || !function_exists('ini_get'))
-	{
-		deregister_globals();
-	}
-
-	define('STRIP', (get_magic_quotes_gpc()) ? true : false);
-}
+require($phpbb_root_path . 'includes/startup.' . $phpEx);
 
 if (file_exists($phpbb_root_path . 'config.' . $phpEx))
 {
-- 
cgit v1.2.1


From f7b06ca12db9da519d49ce334eaf96573d003c0f Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Sat, 9 Jul 2011 23:33:44 +0200
Subject: [feature/template-engine] Move template.php to includes/template

This allows making use of autoloading.

PHPBB3-9726
---
 phpBB/common.php | 1 -
 1 file changed, 1 deletion(-)

(limited to 'phpBB/common.php')

diff --git a/phpBB/common.php b/phpBB/common.php
index 46f78a7926..67fb5cf6ae 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -182,7 +182,6 @@ if (!empty($load_extensions) && function_exists('dl'))
 
 // Include files
 require($phpbb_root_path . 'includes/class_loader.' . $phpEx);
-require($phpbb_root_path . 'includes/template.' . $phpEx);
 require($phpbb_root_path . 'includes/session.' . $phpEx);
 require($phpbb_root_path . 'includes/auth.' . $phpEx);
 
-- 
cgit v1.2.1


From 541a7db1016560d77590b9265c63c10cdd7e01a5 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Wed, 13 Jul 2011 09:51:09 +0200
Subject: [ticket/7090] Update documented minimum PHP version to  5.2.0

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

(limited to 'phpBB/common.php')

diff --git a/phpBB/common.php b/phpBB/common.php
index 9697ed57ee..54e7093c76 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -6,7 +6,7 @@
 * @copyright (c) 2005 phpBB Group
 * @license http://opensource.org/licenses/gpl-license.php GNU Public License
 *
-* Minimum Requirement: PHP 4.3.3
+* Minimum Requirement: PHP 5.2.0
 */
 
 /**
-- 
cgit v1.2.1


From acb767f14d6300ebff793f87b1a62ebbb4bde82a Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Tue, 9 Aug 2011 23:28:40 -0400
Subject: [feature/template-engine] Dependency inject locator into template.

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

(limited to 'phpBB/common.php')

diff --git a/phpBB/common.php b/phpBB/common.php
index 67fb5cf6ae..f206dc70fd 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -224,7 +224,8 @@ $config = new phpbb_config_db($db, $cache->get_driver(), CONFIG_TABLE);
 set_config(null, null, null, $config);
 set_config_count(null, null, null, $config);
 
-$template	= new phpbb_template($phpbb_root_path, $phpEx, $config, $user);
+$template_locator = new phpbb_template_locator();
+$template = new phpbb_template($phpbb_root_path, $phpEx, $config, $user, $template_locator);
 
 // Add own hook handler
 require($phpbb_root_path . 'includes/hooks/index.' . $phpEx);
-- 
cgit v1.2.1


From 14f1e581faa3b66e7689c55c1e9c0485c0872b1e Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Thu, 9 Jun 2011 05:13:26 +0200
Subject: [feature/extension-manager] Extension Manager & Finder

Extensions RFC: http://area51.phpbb.com/phpBB/viewtopic.php?f=84&t=41499
Ticket: http://tracker.phpbb.com/browse/PHPBB3-10323

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

(limited to 'phpBB/common.php')

diff --git a/phpBB/common.php b/phpBB/common.php
index 524c05ae70..7ff06e68d7 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -96,7 +96,7 @@ require($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx);
 set_error_handler(defined('PHPBB_MSG_HANDLER') ? PHPBB_MSG_HANDLER : 'msg_handler');
 
 // Setup class loader first
-$class_loader = new phpbb_class_loader($phpbb_root_path, '.' . $phpEx);
+$class_loader = new phpbb_class_loader($phpbb_root_path . 'includes/', $phpbb_root_path . 'ext/', '.' . $phpEx);
 $class_loader->register();
 
 // set up caching
-- 
cgit v1.2.1


From fb943d4d6b39cea9825aab78e397eefe26cf7bdf Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Mon, 15 Aug 2011 19:34:30 -0400
Subject: [feature/extension-manager] Load the extension manager on all pages

PHPBB3-10323
---
 phpBB/common.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'phpBB/common.php')

diff --git a/phpBB/common.php b/phpBB/common.php
index 7ff06e68d7..cc33b29a09 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -124,6 +124,9 @@ $config = new phpbb_config_db($db, $cache->get_driver(), CONFIG_TABLE);
 set_config(null, null, null, $config);
 set_config_count(null, null, null, $config);
 
+// load extensions
+$phpbb_extension_manager = new phpbb_extension_manager($db, EXT_TABLE, $phpbb_root_path, ".$phpEx", $cache->get_driver());
+
 $template_locator = new phpbb_template_locator();
 $template = new phpbb_template($phpbb_root_path, $phpEx, $config, $user, $template_locator);
 
@@ -138,5 +141,5 @@ foreach ($cache->obtain_hooks() as $hook)
 
 if (!$config['use_system_cron'])
 {
-	$cron = new phpbb_cron_manager($phpbb_root_path . 'includes/cron/task', $phpEx, $cache->get_driver());
+	$cron = new phpbb_cron_manager($phpbb_extension_manager, $cache->get_driver());
 }
-- 
cgit v1.2.1


From 96209e022477d97b581b79cabace4caddd19501b Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Mon, 15 Aug 2011 21:38:47 -0400
Subject: [feature/extension-manager] The class loader no longer knows about
 extensions

Instead the class loader is instantiated twice. Once with the phpbb_ prefix
and once with the phpbb_ext_ prefix.

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

(limited to 'phpBB/common.php')

diff --git a/phpBB/common.php b/phpBB/common.php
index cc33b29a09..61817972f9 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -96,13 +96,16 @@ require($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx);
 set_error_handler(defined('PHPBB_MSG_HANDLER') ? PHPBB_MSG_HANDLER : 'msg_handler');
 
 // Setup class loader first
-$class_loader = new phpbb_class_loader($phpbb_root_path . 'includes/', $phpbb_root_path . 'ext/', '.' . $phpEx);
-$class_loader->register();
+$phpbb_class_loader_ext = new phpbb_class_loader('phpbb_ext_', $phpbb_root_path . 'ext/', ".$phpEx");
+$phpbb_class_loader_ext->register();
+$phpbb_class_loader = new phpbb_class_loader('phpbb_', $phpbb_root_path . 'includes/', ".$phpEx");
+$phpbb_class_loader->register();
 
 // set up caching
 $cache_factory = new phpbb_cache_factory($acm_type);
 $cache = $cache_factory->get_service();
-$class_loader->set_cache($cache->get_driver());
+$phpbb_class_loader_ext->set_cache($cache->get_driver());
+$phpbb_class_loader->set_cache($cache->get_driver());
 
 // Instantiate some basic classes
 $request	= new phpbb_request();
-- 
cgit v1.2.1


From 5d5030a48be3d65df85d78e26690085c0889c6e3 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Sun, 21 Aug 2011 02:57:01 -0400
Subject: [feature/extension-manager] Remove cron's dependency on the extension
 manager.

Instead a separate cron provider supplies the manager with tasks from the
extension finder.

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

(limited to 'phpBB/common.php')

diff --git a/phpBB/common.php b/phpBB/common.php
index 61817972f9..3cc9e57e46 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -144,5 +144,5 @@ foreach ($cache->obtain_hooks() as $hook)
 
 if (!$config['use_system_cron'])
 {
-	$cron = new phpbb_cron_manager($phpbb_extension_manager, $cache->get_driver());
+	$cron = new phpbb_cron_manager(new phpbb_cron_provider($phpbb_extension_manager), $cache->get_driver());
 }
-- 
cgit v1.2.1


From ea46feb11542a9cf54ce083ee0ad03f4c5e02a1e Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Tue, 30 Aug 2011 01:32:11 -0400
Subject: [feature/extension-manager] Add support for templates in extensions.

This commit adds a template path provider to separate the process of locating
(cached) paths in extensions from the template engine. The locator is supplied
with a list of paths from the path provider.

Admin templates can now be created in ext/<ext>/adm/style/ and regular
templates go into ext/<ext>/styles/<style>/template/. Extension templates
override regular templates. So if an extension supplies a file with a name
used in phpBB, the extension's file will be used.

A side-effect of this commit: Locator and Provider are now able to deal with
arbitrary levels of template inheritance. So we can expose this through
phpbb_template if we choose to, and allow styles to inherit from inherited
styles.

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

(limited to 'phpBB/common.php')

diff --git a/phpBB/common.php b/phpBB/common.php
index 3cc9e57e46..279d5c481d 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -130,8 +130,9 @@ set_config_count(null, null, null, $config);
 // load extensions
 $phpbb_extension_manager = new phpbb_extension_manager($db, EXT_TABLE, $phpbb_root_path, ".$phpEx", $cache->get_driver());
 
-$template_locator = new phpbb_template_locator();
-$template = new phpbb_template($phpbb_root_path, $phpEx, $config, $user, $template_locator);
+$phpbb_template_locator = new phpbb_template_locator();
+$phpbb_template_path_provider = new phpbb_template_path_provider($phpbb_extension_manager);
+$template = new phpbb_template($phpbb_root_path, $phpEx, $config, $user, $phpbb_template_locator, $phpbb_template_path_provider);
 
 // Add own hook handler
 require($phpbb_root_path . 'includes/hooks/index.' . $phpEx);
-- 
cgit v1.2.1


From 520a5f92953d350880355dbe46217d2b41edd2bd Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Wed, 31 Aug 2011 17:49:48 -0400
Subject: [feature/extension-manager] Refactoring the structure of extension
 provider

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

(limited to 'phpBB/common.php')

diff --git a/phpBB/common.php b/phpBB/common.php
index 279d5c481d..1b54c07e88 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -131,7 +131,7 @@ set_config_count(null, null, null, $config);
 $phpbb_extension_manager = new phpbb_extension_manager($db, EXT_TABLE, $phpbb_root_path, ".$phpEx", $cache->get_driver());
 
 $phpbb_template_locator = new phpbb_template_locator();
-$phpbb_template_path_provider = new phpbb_template_path_provider($phpbb_extension_manager);
+$phpbb_template_path_provider = new phpbb_template_extension_path_provider($phpbb_extension_manager, new phpbb_template_path_provider());
 $template = new phpbb_template($phpbb_root_path, $phpEx, $config, $user, $phpbb_template_locator, $phpbb_template_path_provider);
 
 // Add own hook handler
@@ -145,5 +145,5 @@ foreach ($cache->obtain_hooks() as $hook)
 
 if (!$config['use_system_cron'])
 {
-	$cron = new phpbb_cron_manager(new phpbb_cron_provider($phpbb_extension_manager), $cache->get_driver());
+	$cron = new phpbb_cron_manager(new phpbb_cron_task_provider($phpbb_extension_manager), $cache->get_driver());
 }
-- 
cgit v1.2.1


From bb616b4135fba145c961f26a4ff612d6579b6b17 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Fri, 14 Oct 2011 02:02:17 +0200
Subject: [ticket/10412] Replace memory_get_usage with memory_get_peak_usage

PHPBB3-10412
---
 phpBB/common.php | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'phpBB/common.php')

diff --git a/phpBB/common.php b/phpBB/common.php
index 524c05ae70..061290dcea 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -59,15 +59,6 @@ if (!defined('PHPBB_INSTALLED'))
 	exit;
 }
 
-if (defined('DEBUG_EXTRA'))
-{
-	$base_memory_usage = 0;
-	if (function_exists('memory_get_usage'))
-	{
-		$base_memory_usage = memory_get_usage();
-	}
-}
-
 // Load Extensions
 // dl() is deprecated and disabled by default as of PHP 5.3.
 if (!empty($load_extensions) && function_exists('dl'))
-- 
cgit v1.2.1


From 7a04c9048c110f0bd21ea3e9e869e17b408d640e Mon Sep 17 00:00:00 2001
From: Unknown <unknownbliss@phpbbdevelopers.net>
Date: Sat, 31 Dec 2011 13:32:52 +0000
Subject: [ticket/9916] Updating header license and removing Version $Id$

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

(limited to 'phpBB/common.php')

diff --git a/phpBB/common.php b/phpBB/common.php
index a5e0de4510..b308037a0e 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -2,9 +2,8 @@
 /**
 *
 * @package phpBB3
-* @version $Id$
 * @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 * Minimum Requirement: PHP 5.2.0
 */
-- 
cgit v1.2.1


From 581b5624f7be3675a35fc61ca6b67b409ae6e8c6 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Sat, 7 Jan 2012 20:53:04 +0100
Subject: [feature/event-dispatcher] Allow subscribers to be loaded from
 extensions

PHPBB3-9550
---
 phpBB/common.php | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'phpBB/common.php')

diff --git a/phpBB/common.php b/phpBB/common.php
index b308037a0e..44a0e7cec3 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -98,6 +98,7 @@ $phpbb_class_loader_ext->set_cache($cache->get_driver());
 $phpbb_class_loader->set_cache($cache->get_driver());
 
 // Instantiate some basic classes
+$phpbb_dispatcher = new phpbb_event_dispatcher();
 $request	= new phpbb_request();
 $user		= new user();
 $auth		= new auth();
@@ -124,6 +125,9 @@ $phpbb_template_locator = new phpbb_template_locator();
 $phpbb_template_path_provider = new phpbb_template_extension_path_provider($phpbb_extension_manager, new phpbb_template_path_provider());
 $template = new phpbb_template($phpbb_root_path, $phpEx, $config, $user, $phpbb_template_locator, $phpbb_template_path_provider);
 
+$phpbb_subscriber_loader = new phpbb_event_extension_subscriber_loader($phpbb_dispatcher, $phpbb_extension_manager);
+$phpbb_subscriber_loader->load();
+
 // Add own hook handler
 require($phpbb_root_path . 'includes/hooks/index.' . $phpEx);
 $phpbb_hook = new phpbb_hook(array('exit_handler', 'phpbb_user_session_handler', 'append_sid', array('template', 'display')));
-- 
cgit v1.2.1


From e02d92ac62fbe1dc08994444c18a7447d72c56e6 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Sun, 11 Mar 2012 15:14:13 +0100
Subject: [feature/event-dispatcher] Use real EventDispatcher through composer

* replace the copy-pasta EventDispatcher with the real one from Symfony2
* use composer for managing this dependency, use composer autoloading

PHPBB3-9550
---
 phpBB/common.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'phpBB/common.php')

diff --git a/phpBB/common.php b/phpBB/common.php
index 44a0e7cec3..c48418276a 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -15,6 +15,8 @@ if (!defined('IN_PHPBB'))
 	exit;
 }
 
+use Symfony\Component\EventDispatcher\EventDispatcher;
+
 require($phpbb_root_path . 'includes/startup.' . $phpEx);
 
 if (file_exists($phpbb_root_path . 'config.' . $phpEx))
@@ -70,6 +72,8 @@ if (!empty($load_extensions) && function_exists('dl'))
 	}
 }
 
+require($phpbb_root_path . 'vendor/.composer/autoload.php');
+
 // Include files
 require($phpbb_root_path . 'includes/class_loader.' . $phpEx);
 require($phpbb_root_path . 'includes/session.' . $phpEx);
@@ -98,7 +102,7 @@ $phpbb_class_loader_ext->set_cache($cache->get_driver());
 $phpbb_class_loader->set_cache($cache->get_driver());
 
 // Instantiate some basic classes
-$phpbb_dispatcher = new phpbb_event_dispatcher();
+$phpbb_dispatcher = new EventDispatcher();
 $request	= new phpbb_request();
 $user		= new user();
 $auth		= new auth();
-- 
cgit v1.2.1


From b7d84a586c1e253ff7075e80ab721db5c1101c9f Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Wed, 14 Mar 2012 23:12:11 +0200
Subject: [feature/merging-style-components] Renaming template classes

Changing template classes prefixes from phpbb_template to phpbb_style (for classes that will work with styles) or phpbb_style_template (for classes that are specific to templates)

PHPBB3-10632
---
 phpBB/common.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/common.php')

diff --git a/phpBB/common.php b/phpBB/common.php
index b308037a0e..a38a986280 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -120,9 +120,9 @@ set_config_count(null, null, null, $config);
 // load extensions
 $phpbb_extension_manager = new phpbb_extension_manager($db, EXT_TABLE, $phpbb_root_path, ".$phpEx", $cache->get_driver());
 
-$phpbb_template_locator = new phpbb_template_locator();
-$phpbb_template_path_provider = new phpbb_template_extension_path_provider($phpbb_extension_manager, new phpbb_template_path_provider());
-$template = new phpbb_template($phpbb_root_path, $phpEx, $config, $user, $phpbb_template_locator, $phpbb_template_path_provider);
+$phpbb_style_locator = new phpbb_style_locator();
+$phpbb_style_path_provider = new phpbb_style_extension_path_provider($phpbb_extension_manager, new phpbb_style_path_provider());
+$template = new phpbb_style_template($phpbb_root_path, $phpEx, $config, $user, $phpbb_style_locator, $phpbb_style_path_provider);
 
 // Add own hook handler
 require($phpbb_root_path . 'includes/hooks/index.' . $phpEx);
-- 
cgit v1.2.1


From 3997ffac2a2e6f422dcd5cd5bd076edee6fa91dd Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Thu, 15 Mar 2012 13:13:21 +0200
Subject: [feature/merging-style-components] Creating style class

Creating phpbb_style class, changing template initialization to style initialization

PHPBB3-10632
---
 phpBB/common.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/common.php')

diff --git a/phpBB/common.php b/phpBB/common.php
index a38a986280..dd49b29528 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -120,9 +120,9 @@ set_config_count(null, null, null, $config);
 // load extensions
 $phpbb_extension_manager = new phpbb_extension_manager($db, EXT_TABLE, $phpbb_root_path, ".$phpEx", $cache->get_driver());
 
-$phpbb_style_locator = new phpbb_style_locator();
-$phpbb_style_path_provider = new phpbb_style_extension_path_provider($phpbb_extension_manager, new phpbb_style_path_provider());
-$template = new phpbb_style_template($phpbb_root_path, $phpEx, $config, $user, $phpbb_style_locator, $phpbb_style_path_provider);
+// Initialize style
+$style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $phpbb_extension_manager);
+$template = $style->template;
 
 // Add own hook handler
 require($phpbb_root_path . 'includes/hooks/index.' . $phpEx);
-- 
cgit v1.2.1


From 0af7d610c08307fbe8df20e0d44e54dcb9429d64 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sat, 17 Mar 2012 22:45:27 -0400
Subject: [feature/event-dispatcher] Delete hard dependency on composer.

Applications should not depend on package managers.

PHPBB3-9550
---
 phpBB/common.php | 2 --
 1 file changed, 2 deletions(-)

(limited to 'phpBB/common.php')

diff --git a/phpBB/common.php b/phpBB/common.php
index c48418276a..132b95c1fe 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -72,8 +72,6 @@ if (!empty($load_extensions) && function_exists('dl'))
 	}
 }
 
-require($phpbb_root_path . 'vendor/.composer/autoload.php');
-
 // Include files
 require($phpbb_root_path . 'includes/class_loader.' . $phpEx);
 require($phpbb_root_path . 'includes/session.' . $phpEx);
-- 
cgit v1.2.1


From baefbdb8825a37051a200203a0191d34caa12229 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Wed, 21 Mar 2012 13:15:45 +0100
Subject: [feature/event-dispatcher] Add phpbb_event_dispatcher_wrapper

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

(limited to 'phpBB/common.php')

diff --git a/phpBB/common.php b/phpBB/common.php
index 132b95c1fe..c7e66ef0d6 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -100,7 +100,7 @@ $phpbb_class_loader_ext->set_cache($cache->get_driver());
 $phpbb_class_loader->set_cache($cache->get_driver());
 
 // Instantiate some basic classes
-$phpbb_dispatcher = new EventDispatcher();
+$phpbb_dispatcher = new phpbb_event_dispatcher_wrapper(new EventDispatcher());
 $request	= new phpbb_request();
 $user		= new user();
 $auth		= new auth();
-- 
cgit v1.2.1


From 400277c03624788e6a31f9aa4a15b883478f58cc Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Sat, 24 Mar 2012 15:45:18 +0100
Subject: [feature/event-dispatcher] Change phpbb_event_dispatcher to
 inheritance, tests

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

(limited to 'phpBB/common.php')

diff --git a/phpBB/common.php b/phpBB/common.php
index c7e66ef0d6..fafcb81feb 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -100,7 +100,7 @@ $phpbb_class_loader_ext->set_cache($cache->get_driver());
 $phpbb_class_loader->set_cache($cache->get_driver());
 
 // Instantiate some basic classes
-$phpbb_dispatcher = new phpbb_event_dispatcher_wrapper(new EventDispatcher());
+$phpbb_dispatcher = new phpbb_event_dispatcher();
 $request	= new phpbb_request();
 $user		= new user();
 $auth		= new auth();
-- 
cgit v1.2.1


From 063f6893af754cc992e487d323f766889bebba01 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Thu, 8 Mar 2012 18:04:24 -0500
Subject: [task/php5.3] Looks like I missed a few places that needed PHP 5.2
 changed to PHP 5.3.2

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

(limited to 'phpBB/common.php')

diff --git a/phpBB/common.php b/phpBB/common.php
index b308037a0e..8e149fef57 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -5,7 +5,7 @@
 * @copyright (c) 2005 phpBB Group
 * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
-* Minimum Requirement: PHP 5.2.0
+* Minimum Requirement: PHP 5.3.2
 */
 
 /**
-- 
cgit v1.2.1


From 360312f599edd852e14fcd162552e19dd2d278a6 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Sat, 31 Mar 2012 17:38:30 +0300
Subject: [feature/merging-style-components] Initializing locator and provider
 separately

Moving locator and path provider initialization out of style class

PHPBB3-10632
---
 phpBB/common.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'phpBB/common.php')

diff --git a/phpBB/common.php b/phpBB/common.php
index 3f039e49c0..1e3f787611 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -124,7 +124,9 @@ set_config_count(null, null, null, $config);
 $phpbb_extension_manager = new phpbb_extension_manager($db, EXT_TABLE, $phpbb_root_path, ".$phpEx", $cache->get_driver());
 
 // Initialize style
-$style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $phpbb_extension_manager);
+$phpbb_style_resource_locator = new phpbb_style_resource_locator();
+$phpbb_style_path_provider = new phpbb_style_extension_path_provider($phpbb_extension_manager, new phpbb_style_path_provider());
+$style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $phpbb_style_resource_locator, $phpbb_style_path_provider);
 $template = $style->template;
 
 $phpbb_subscriber_loader = new phpbb_event_extension_subscriber_loader($phpbb_dispatcher, $phpbb_extension_manager);
-- 
cgit v1.2.1


From 17989c17a040a28aeeefcf55f6cca054b28c06ed Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Sat, 31 Mar 2012 18:10:00 +0300
Subject: [feature/merging-style-components] Moving template initialization out
 of style

Moving template initialization out of style constructor

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

(limited to 'phpBB/common.php')

diff --git a/phpBB/common.php b/phpBB/common.php
index 1e3f787611..c11d39d9a1 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -126,8 +126,8 @@ $phpbb_extension_manager = new phpbb_extension_manager($db, EXT_TABLE, $phpbb_ro
 // Initialize style
 $phpbb_style_resource_locator = new phpbb_style_resource_locator();
 $phpbb_style_path_provider = new phpbb_style_extension_path_provider($phpbb_extension_manager, new phpbb_style_path_provider());
-$style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $phpbb_style_resource_locator, $phpbb_style_path_provider);
-$template = $style->template;
+$template = new phpbb_style_template($phpbb_root_path, $phpEx, $config, $user, $phpbb_style_resource_locator, $phpbb_style_path_provider);
+$style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $phpbb_style_resource_locator, $phpbb_style_path_provider, $template);
 
 $phpbb_subscriber_loader = new phpbb_event_extension_subscriber_loader($phpbb_dispatcher, $phpbb_extension_manager);
 $phpbb_subscriber_loader->load();
-- 
cgit v1.2.1


From 6deb7b3671c29ab7ce1db6e11b5c6be0950d265f Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Sat, 31 Mar 2012 02:50:19 +0200
Subject: [feature/class-prefix] Rename user and session to phpbb_*

PHPBB-10609
---
 phpBB/common.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'phpBB/common.php')

diff --git a/phpBB/common.php b/phpBB/common.php
index c11d39d9a1..c4430208dc 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -74,7 +74,6 @@ if (!empty($load_extensions) && function_exists('dl'))
 
 // Include files
 require($phpbb_root_path . 'includes/class_loader.' . $phpEx);
-require($phpbb_root_path . 'includes/session.' . $phpEx);
 require($phpbb_root_path . 'includes/auth.' . $phpEx);
 
 require($phpbb_root_path . 'includes/functions.' . $phpEx);
@@ -102,7 +101,7 @@ $phpbb_class_loader->set_cache($cache->get_driver());
 // Instantiate some basic classes
 $phpbb_dispatcher = new phpbb_event_dispatcher();
 $request	= new phpbb_request();
-$user		= new user();
+$user		= new phpbb_user();
 $auth		= new auth();
 $db			= new $sql_db();
 
-- 
cgit v1.2.1


From 9236dd4c471a6f7655bd00ae422a13013a400ac4 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Sat, 31 Mar 2012 02:54:39 +0200
Subject: [feature/class-prefix] Rename auth => phpbb_auth

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

(limited to 'phpBB/common.php')

diff --git a/phpBB/common.php b/phpBB/common.php
index c4430208dc..b3b8d7e4f7 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -74,7 +74,6 @@ if (!empty($load_extensions) && function_exists('dl'))
 
 // Include files
 require($phpbb_root_path . 'includes/class_loader.' . $phpEx);
-require($phpbb_root_path . 'includes/auth.' . $phpEx);
 
 require($phpbb_root_path . 'includes/functions.' . $phpEx);
 require($phpbb_root_path . 'includes/functions_content.' . $phpEx);
@@ -102,7 +101,7 @@ $phpbb_class_loader->set_cache($cache->get_driver());
 $phpbb_dispatcher = new phpbb_event_dispatcher();
 $request	= new phpbb_request();
 $user		= new phpbb_user();
-$auth		= new auth();
+$auth		= new phpbb_auth();
 $db			= new $sql_db();
 
 // make sure request_var uses this request instance
-- 
cgit v1.2.1


From 8e2cbe39cdd7672638dbc0d6a0f65a7365db0d91 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Sat, 31 Mar 2012 04:06:52 +0200
Subject: [feature/dic] Convert common.php to Symfony2 DependencyInjection
 component

PHPBB3-10739
---
 phpBB/common.php | 43 ++++++++++++++++++++++---------------------
 1 file changed, 22 insertions(+), 21 deletions(-)

(limited to 'phpBB/common.php')

diff --git a/phpBB/common.php b/phpBB/common.php
index b3b8d7e4f7..aa6115fe1c 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -15,6 +15,9 @@ if (!defined('IN_PHPBB'))
 	exit;
 }
 
+use Symfony\Component\Config\FileLocator;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
 use Symfony\Component\EventDispatcher\EventDispatcher;
 
 require($phpbb_root_path . 'includes/startup.' . $phpEx);
@@ -91,43 +94,41 @@ $phpbb_class_loader_ext->register();
 $phpbb_class_loader = new phpbb_class_loader('phpbb_', $phpbb_root_path . 'includes/', ".$phpEx");
 $phpbb_class_loader->register();
 
+$container = new ContainerBuilder();
+$loader = new YamlFileLoader($container, new FileLocator(__DIR__.'/config'));
+$loader->load('parameters.yml');
+$loader->load('services.yml');
+
+$container->setParameter('core.root_path', $phpbb_root_path);
+$container->setParameter('core.php_ext', $phpEx);
+
 // set up caching
-$cache_factory = new phpbb_cache_factory($acm_type);
-$cache = $cache_factory->get_service();
+$cache = $container->get('cache');
 $phpbb_class_loader_ext->set_cache($cache->get_driver());
 $phpbb_class_loader->set_cache($cache->get_driver());
 
 // Instantiate some basic classes
-$phpbb_dispatcher = new phpbb_event_dispatcher();
-$request	= new phpbb_request();
-$user		= new phpbb_user();
-$auth		= new phpbb_auth();
-$db			= new $sql_db();
+$phpbb_dispatcher = $container->get('dispatcher');
+$request	= $container->get('request');
+$user		= $container->get('user');
+$auth		= $container->get('auth');
+$db			= $container->get('dbal.conn');
 
 // make sure request_var uses this request instance
 request_var('', 0, false, false, $request); // "dependency injection" for a function
 
-// Connect to DB
-$db->sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, $dbport, false, defined('PHPBB_DB_NEW_LINK') ? PHPBB_DB_NEW_LINK : false);
-
-// We do not need this any longer, unset for safety purposes
-unset($dbpasswd);
-
 // Grab global variables, re-cache if necessary
-$config = new phpbb_config_db($db, $cache->get_driver(), CONFIG_TABLE);
+$config = $container->get('config');
 set_config(null, null, null, $config);
 set_config_count(null, null, null, $config);
 
 // load extensions
-$phpbb_extension_manager = new phpbb_extension_manager($db, EXT_TABLE, $phpbb_root_path, ".$phpEx", $cache->get_driver());
+$phpbb_extension_manager = $container->get('ext.manager');
 
-// Initialize style
-$phpbb_style_resource_locator = new phpbb_style_resource_locator();
-$phpbb_style_path_provider = new phpbb_style_extension_path_provider($phpbb_extension_manager, new phpbb_style_path_provider());
-$template = new phpbb_style_template($phpbb_root_path, $phpEx, $config, $user, $phpbb_style_resource_locator, $phpbb_style_path_provider);
-$style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $phpbb_style_resource_locator, $phpbb_style_path_provider, $template);
+$template = $container->get('template');
+$style = $container->get('style');
 
-$phpbb_subscriber_loader = new phpbb_event_extension_subscriber_loader($phpbb_dispatcher, $phpbb_extension_manager);
+$phpbb_subscriber_loader = $container->get('event.subscriber_loader');
 $phpbb_subscriber_loader->load();
 
 // Add own hook handler
-- 
cgit v1.2.1


From 776160a7e35a1f82325b7acf573906310791c573 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Sat, 31 Mar 2012 20:23:33 +0200
Subject: [feature/dic] Fetch cache driver explicitly

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

(limited to 'phpBB/common.php')

diff --git a/phpBB/common.php b/phpBB/common.php
index aa6115fe1c..591969df74 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -104,8 +104,8 @@ $container->setParameter('core.php_ext', $phpEx);
 
 // set up caching
 $cache = $container->get('cache');
-$phpbb_class_loader_ext->set_cache($cache->get_driver());
-$phpbb_class_loader->set_cache($cache->get_driver());
+$phpbb_class_loader_ext->set_cache($container->get('cache.driver'));
+$phpbb_class_loader->set_cache($container->get('cache.driver'));
 
 // Instantiate some basic classes
 $phpbb_dispatcher = $container->get('dispatcher');
-- 
cgit v1.2.1


From bca600877cbd92246949366238d365bbc3039d5a Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Sat, 31 Mar 2012 20:27:46 +0200
Subject: [feature/dic] Move cron manager into DIC

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

(limited to 'phpBB/common.php')

diff --git a/phpBB/common.php b/phpBB/common.php
index 591969df74..0446b5c15e 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -142,5 +142,5 @@ foreach ($cache->obtain_hooks() as $hook)
 
 if (!$config['use_system_cron'])
 {
-	$cron = new phpbb_cron_manager(new phpbb_cron_task_provider($phpbb_extension_manager), $cache->get_driver());
+	$cron = $container->get('cron.manager');
 }
-- 
cgit v1.2.1


From 873630f04e6502cc69e6b208f596414f240bc923 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Sat, 31 Mar 2012 20:45:33 +0200
Subject: [feature/dic] Move class loader into DIC

PHPBB3-10739
---
 phpBB/common.php | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'phpBB/common.php')

diff --git a/phpBB/common.php b/phpBB/common.php
index 0446b5c15e..117dc2051e 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -88,12 +88,6 @@ require($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx);
 // Set PHP error handler to ours
 set_error_handler(defined('PHPBB_MSG_HANDLER') ? PHPBB_MSG_HANDLER : 'msg_handler');
 
-// Setup class loader first
-$phpbb_class_loader_ext = new phpbb_class_loader('phpbb_ext_', $phpbb_root_path . 'ext/', ".$phpEx");
-$phpbb_class_loader_ext->register();
-$phpbb_class_loader = new phpbb_class_loader('phpbb_', $phpbb_root_path . 'includes/', ".$phpEx");
-$phpbb_class_loader->register();
-
 $container = new ContainerBuilder();
 $loader = new YamlFileLoader($container, new FileLocator(__DIR__.'/config'));
 $loader->load('parameters.yml');
@@ -102,6 +96,12 @@ $loader->load('services.yml');
 $container->setParameter('core.root_path', $phpbb_root_path);
 $container->setParameter('core.php_ext', $phpEx);
 
+// Setup class loader first
+$phpbb_class_loader_ext = $container->get('class_loader.ext');
+$phpbb_class_loader_ext->register();
+$phpbb_class_loader = $container->get('class_loader');
+$phpbb_class_loader->register();
+
 // set up caching
 $cache = $container->get('cache');
 $phpbb_class_loader_ext->set_cache($container->get('cache.driver'));
@@ -124,13 +124,12 @@ set_config_count(null, null, null, $config);
 
 // load extensions
 $phpbb_extension_manager = $container->get('ext.manager');
+$phpbb_subscriber_loader = $container->get('event.subscriber_loader');
+$phpbb_subscriber_loader->load();
 
 $template = $container->get('template');
 $style = $container->get('style');
 
-$phpbb_subscriber_loader = $container->get('event.subscriber_loader');
-$phpbb_subscriber_loader->load();
-
 // Add own hook handler
 require($phpbb_root_path . 'includes/hooks/index.' . $phpEx);
 $phpbb_hook = new phpbb_hook(array('exit_handler', 'phpbb_user_session_handler', 'append_sid', array('template', 'display')));
-- 
cgit v1.2.1


From dc9ccc432cd0b24cf762f8285d8a90f52b8efe5b Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Sat, 31 Mar 2012 21:20:58 +0200
Subject: [feature/dic] Make use of calls to cut down on boilerplate

PHPBB3-10739
---
 phpBB/common.php | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'phpBB/common.php')

diff --git a/phpBB/common.php b/phpBB/common.php
index 117dc2051e..51478662d7 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -97,15 +97,11 @@ $container->setParameter('core.root_path', $phpbb_root_path);
 $container->setParameter('core.php_ext', $phpEx);
 
 // Setup class loader first
-$phpbb_class_loader_ext = $container->get('class_loader.ext');
-$phpbb_class_loader_ext->register();
 $phpbb_class_loader = $container->get('class_loader');
-$phpbb_class_loader->register();
+$phpbb_class_loader_ext = $container->get('class_loader.ext');
 
 // set up caching
 $cache = $container->get('cache');
-$phpbb_class_loader_ext->set_cache($container->get('cache.driver'));
-$phpbb_class_loader->set_cache($container->get('cache.driver'));
 
 // Instantiate some basic classes
 $phpbb_dispatcher = $container->get('dispatcher');
@@ -125,7 +121,6 @@ set_config_count(null, null, null, $config);
 // load extensions
 $phpbb_extension_manager = $container->get('ext.manager');
 $phpbb_subscriber_loader = $container->get('event.subscriber_loader');
-$phpbb_subscriber_loader->load();
 
 $template = $container->get('template');
 $style = $container->get('style');
-- 
cgit v1.2.1


From 57065095d570f0ff5976470ce81a4b216fe5f98e Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Tue, 3 Apr 2012 00:41:56 +0300
Subject: [ticket/10754] Changing $style to $phpbb_style

Renaming global variable $style to $phpbb_style

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

(limited to 'phpBB/common.php')

diff --git a/phpBB/common.php b/phpBB/common.php
index b3b8d7e4f7..a00e3e82a8 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -125,7 +125,7 @@ $phpbb_extension_manager = new phpbb_extension_manager($db, EXT_TABLE, $phpbb_ro
 $phpbb_style_resource_locator = new phpbb_style_resource_locator();
 $phpbb_style_path_provider = new phpbb_style_extension_path_provider($phpbb_extension_manager, new phpbb_style_path_provider());
 $template = new phpbb_style_template($phpbb_root_path, $phpEx, $config, $user, $phpbb_style_resource_locator, $phpbb_style_path_provider);
-$style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $phpbb_style_resource_locator, $phpbb_style_path_provider, $template);
+$phpbb_style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $phpbb_style_resource_locator, $phpbb_style_path_provider, $template);
 
 $phpbb_subscriber_loader = new phpbb_event_extension_subscriber_loader($phpbb_dispatcher, $phpbb_extension_manager);
 $phpbb_subscriber_loader->load();
-- 
cgit v1.2.1


From 2e76620c8824da62f97cfdaee8f9b1014159fd7c Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Mon, 9 Apr 2012 00:22:55 +0200
Subject: [feature/dic] Rewrite cron system to use DIC

PHPBB3-10739
---
 phpBB/common.php | 37 +++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 18 deletions(-)

(limited to 'phpBB/common.php')

diff --git a/phpBB/common.php b/phpBB/common.php
index 51478662d7..c9eb5d217b 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -88,42 +88,43 @@ require($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx);
 // Set PHP error handler to ours
 set_error_handler(defined('PHPBB_MSG_HANDLER') ? PHPBB_MSG_HANDLER : 'msg_handler');
 
-$container = new ContainerBuilder();
-$loader = new YamlFileLoader($container, new FileLocator(__DIR__.'/config'));
+$phpbb_container = new ContainerBuilder();
+$loader = new YamlFileLoader($phpbb_container, new FileLocator(__DIR__.'/config'));
 $loader->load('parameters.yml');
 $loader->load('services.yml');
 
-$container->setParameter('core.root_path', $phpbb_root_path);
-$container->setParameter('core.php_ext', $phpEx);
+$phpbb_container->setParameter('core.root_path', $phpbb_root_path);
+$phpbb_container->setParameter('core.php_ext', $phpEx);
+$phpbb_container->set('container', $phpbb_container);
 
 // Setup class loader first
-$phpbb_class_loader = $container->get('class_loader');
-$phpbb_class_loader_ext = $container->get('class_loader.ext');
+$phpbb_class_loader = $phpbb_container->get('class_loader');
+$phpbb_class_loader_ext = $phpbb_container->get('class_loader.ext');
 
 // set up caching
-$cache = $container->get('cache');
+$cache = $phpbb_container->get('cache');
 
 // Instantiate some basic classes
-$phpbb_dispatcher = $container->get('dispatcher');
-$request	= $container->get('request');
-$user		= $container->get('user');
-$auth		= $container->get('auth');
-$db			= $container->get('dbal.conn');
+$phpbb_dispatcher = $phpbb_container->get('dispatcher');
+$request	= $phpbb_container->get('request');
+$user		= $phpbb_container->get('user');
+$auth		= $phpbb_container->get('auth');
+$db			= $phpbb_container->get('dbal.conn');
 
 // make sure request_var uses this request instance
 request_var('', 0, false, false, $request); // "dependency injection" for a function
 
 // Grab global variables, re-cache if necessary
-$config = $container->get('config');
+$config = $phpbb_container->get('config');
 set_config(null, null, null, $config);
 set_config_count(null, null, null, $config);
 
 // load extensions
-$phpbb_extension_manager = $container->get('ext.manager');
-$phpbb_subscriber_loader = $container->get('event.subscriber_loader');
+$phpbb_extension_manager = $phpbb_container->get('ext.manager');
+$phpbb_subscriber_loader = $phpbb_container->get('event.subscriber_loader');
 
-$template = $container->get('template');
-$style = $container->get('style');
+$template = $phpbb_container->get('template');
+$style = $phpbb_container->get('style');
 
 // Add own hook handler
 require($phpbb_root_path . 'includes/hooks/index.' . $phpEx);
@@ -136,5 +137,5 @@ foreach ($cache->obtain_hooks() as $hook)
 
 if (!$config['use_system_cron'])
 {
-	$cron = $container->get('cron.manager');
+	$cron = $phpbb_container->get('cron.manager');
 }
-- 
cgit v1.2.1


From 6cecc91326135fbb36eb9d73aa25fc40cfdfb54b Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Tue, 3 Apr 2012 13:23:08 +0300
Subject: [ticket/10756] Removing path provider from template class

Removing path provider from template class because it is not used by template class

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

(limited to 'phpBB/common.php')

diff --git a/phpBB/common.php b/phpBB/common.php
index a00e3e82a8..7694620b36 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -124,7 +124,8 @@ $phpbb_extension_manager = new phpbb_extension_manager($db, EXT_TABLE, $phpbb_ro
 // Initialize style
 $phpbb_style_resource_locator = new phpbb_style_resource_locator();
 $phpbb_style_path_provider = new phpbb_style_extension_path_provider($phpbb_extension_manager, new phpbb_style_path_provider());
-$template = new phpbb_style_template($phpbb_root_path, $phpEx, $config, $user, $phpbb_style_resource_locator, $phpbb_style_path_provider);
+
+$template = new phpbb_style_template($phpbb_root_path, $phpEx, $config, $user, $phpbb_style_resource_locator);
 $phpbb_style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $phpbb_style_resource_locator, $phpbb_style_path_provider, $template);
 
 $phpbb_subscriber_loader = new phpbb_event_extension_subscriber_loader($phpbb_dispatcher, $phpbb_extension_manager);
-- 
cgit v1.2.1


From d91abbb146d3a808764bf19b9e6adc6e14db1751 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Tue, 3 Apr 2012 13:57:12 +0300
Subject: [ticket/10756] Renaming phpbb_style_template to phpbb_template

Renaming phpbb_style_template to phpbb_template

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

(limited to 'phpBB/common.php')

diff --git a/phpBB/common.php b/phpBB/common.php
index 7694620b36..81fe275008 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -124,8 +124,7 @@ $phpbb_extension_manager = new phpbb_extension_manager($db, EXT_TABLE, $phpbb_ro
 // Initialize style
 $phpbb_style_resource_locator = new phpbb_style_resource_locator();
 $phpbb_style_path_provider = new phpbb_style_extension_path_provider($phpbb_extension_manager, new phpbb_style_path_provider());
-
-$template = new phpbb_style_template($phpbb_root_path, $phpEx, $config, $user, $phpbb_style_resource_locator);
+$template = new phpbb_template($phpbb_root_path, $phpEx, $config, $user, $phpbb_style_resource_locator);
 $phpbb_style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $phpbb_style_resource_locator, $phpbb_style_path_provider, $template);
 
 $phpbb_subscriber_loader = new phpbb_event_extension_subscriber_loader($phpbb_dispatcher, $phpbb_extension_manager);
-- 
cgit v1.2.1


From 32d2ee61f78e3aeaac5f4f1bcb672c67aa10b10e Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Sat, 21 Jul 2012 16:14:21 +0200
Subject: [feature/dic] Configure container via config.php, use compiler pass

PHPBB3-10739
---
 phpBB/common.php | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

(limited to 'phpBB/common.php')

diff --git a/phpBB/common.php b/phpBB/common.php
index a69b26c006..e7dabec4ca 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -8,6 +8,11 @@
 * Minimum Requirement: PHP 5.3.2
 */
 
+use Symfony\Component\Config\FileLocator;
+use Symfony\Component\DependencyInjection\Compiler\Compiler;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
+
 /**
 */
 if (!defined('IN_PHPBB'))
@@ -15,11 +20,6 @@ if (!defined('IN_PHPBB'))
 	exit;
 }
 
-use Symfony\Component\Config\FileLocator;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
-use Symfony\Component\EventDispatcher\EventDispatcher;
-
 require($phpbb_root_path . 'includes/startup.' . $phpEx);
 
 if (file_exists($phpbb_root_path . 'config.' . $phpEx))
@@ -77,25 +77,26 @@ if (!empty($load_extensions) && function_exists('dl'))
 
 // Include files
 require($phpbb_root_path . 'includes/class_loader.' . $phpEx);
+require($phpbb_root_path . 'includes/di/compiler/config_pass.' . $phpEx);
 
 require($phpbb_root_path . 'includes/functions.' . $phpEx);
 require($phpbb_root_path . 'includes/functions_content.' . $phpEx);
 
 require($phpbb_root_path . 'includes/constants.' . $phpEx);
-require($phpbb_root_path . 'includes/db/' . $dbms . '.' . $phpEx);
+require($phpbb_root_path . 'includes/db/' . ltrim($dbms, 'dbal_') . '.' . $phpEx);
 require($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx);
 
+
 // Set PHP error handler to ours
 set_error_handler(defined('PHPBB_MSG_HANDLER') ? PHPBB_MSG_HANDLER : 'msg_handler');
 
 $phpbb_container = new ContainerBuilder();
 $loader = new YamlFileLoader($phpbb_container, new FileLocator(__DIR__.'/config'));
-$loader->load('parameters.yml');
 $loader->load('services.yml');
 
-$phpbb_container->setParameter('core.root_path', $phpbb_root_path);
-$phpbb_container->setParameter('core.php_ext', $phpEx);
-$phpbb_container->set('container', $phpbb_container);
+$phpbb_compiler = new Compiler();
+$phpbb_compiler->addPass(new phpbb_di_compiler_config_pass($phpbb_root_path . 'config.' . $phpEx, $phpbb_root_path, $phpEx));
+$phpbb_compiler->compile($phpbb_container);
 
 // Setup class loader first
 $phpbb_class_loader = $phpbb_container->get('class_loader');
-- 
cgit v1.2.1


From 967cc550ed9bb74480f46212768502627f26d62d Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Sat, 21 Jul 2012 20:42:07 +0200
Subject: [feature/dic] Introduce DI processors instead of abusing compiler
 passes

PHPBB3-10739
---
 phpBB/common.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'phpBB/common.php')

diff --git a/phpBB/common.php b/phpBB/common.php
index e7dabec4ca..406d8bb093 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -77,7 +77,8 @@ if (!empty($load_extensions) && function_exists('dl'))
 
 // Include files
 require($phpbb_root_path . 'includes/class_loader.' . $phpEx);
-require($phpbb_root_path . 'includes/di/compiler/config_pass.' . $phpEx);
+require($phpbb_root_path . 'includes/di/processor/interface.' . $phpEx);
+require($phpbb_root_path . 'includes/di/processor/config.' . $phpEx);
 
 require($phpbb_root_path . 'includes/functions.' . $phpEx);
 require($phpbb_root_path . 'includes/functions_content.' . $phpEx);
@@ -94,9 +95,8 @@ $phpbb_container = new ContainerBuilder();
 $loader = new YamlFileLoader($phpbb_container, new FileLocator(__DIR__.'/config'));
 $loader->load('services.yml');
 
-$phpbb_compiler = new Compiler();
-$phpbb_compiler->addPass(new phpbb_di_compiler_config_pass($phpbb_root_path . 'config.' . $phpEx, $phpbb_root_path, $phpEx));
-$phpbb_compiler->compile($phpbb_container);
+$processor = new phpbb_di_processor_config($phpbb_root_path . 'config.' . $phpEx, $phpbb_root_path, $phpEx);
+$processor->process($phpbb_container);
 
 // Setup class loader first
 $phpbb_class_loader = $phpbb_container->get('class_loader');
-- 
cgit v1.2.1


From 50bc453aa6c91ae9c9df5cb633615825c9df7b6d Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Sat, 21 Jul 2012 21:02:55 +0200
Subject: [feature/dic] Load services from extensions

PHPBB3-10739
---
 phpBB/common.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'phpBB/common.php')

diff --git a/phpBB/common.php b/phpBB/common.php
index 406d8bb093..f958f06ce0 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -9,7 +9,6 @@
 */
 
 use Symfony\Component\Config\FileLocator;
-use Symfony\Component\DependencyInjection\Compiler\Compiler;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
 
@@ -102,6 +101,12 @@ $processor->process($phpbb_container);
 $phpbb_class_loader = $phpbb_container->get('class_loader');
 $phpbb_class_loader_ext = $phpbb_container->get('class_loader.ext');
 
+$ids = array_keys($phpbb_container->findTaggedServiceIds('container.processor'));
+foreach ($ids as $id) {
+	$processor = $phpbb_container->get($id);
+	$processor->process($phpbb_container);
+}
+
 // set up caching
 $cache = $phpbb_container->get('cache');
 
-- 
cgit v1.2.1


From 3339935db316859b38a820b7cf3ebff204b72d7f Mon Sep 17 00:00:00 2001
From: Michael Cullum <unknownbliss@phpbbdevelopers.net>
Date: Fri, 16 Mar 2012 14:58:29 +0000
Subject: [feature/events] Adding core.common ledge

PHPBB3-9550
---
 phpBB/common.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/common.php')

diff --git a/phpBB/common.php b/phpBB/common.php
index 81fe275008..9cf2617b07 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -143,3 +143,5 @@ if (!$config['use_system_cron'])
 {
 	$cron = new phpbb_cron_manager(new phpbb_cron_task_provider($phpbb_extension_manager), $cache->get_driver());
 }
+
+$phpbb_dispatcher->dispatch('core.common');
-- 
cgit v1.2.1


From 01369dd7f826a27e9970e0c0acb126cb2349c87c Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 31 Jul 2012 23:50:31 +0200
Subject: [feature/php-events] Add docs to core.common

@todo: Add event to user::setup() after branch is updated to develop,
so timezone handling is there

PHPBB3-9550
---
 phpBB/common.php | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'phpBB/common.php')

diff --git a/phpBB/common.php b/phpBB/common.php
index 9cf2617b07..e18c27abd1 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -144,4 +144,17 @@ if (!$config['use_system_cron'])
 	$cron = new phpbb_cron_manager(new phpbb_cron_task_provider($phpbb_extension_manager), $cache->get_driver());
 }
 
+/**
+* Main event which is triggered on every page
+*
+* You can use this event to load function files and initiate objects
+*
+* NOTE:	At this point the global session ($user) and permissions ($auth)
+*		do NOT exist yet. If you need to use the user objec
+*		(f.e. to use language files) or need to check permissions, please use
+*		the core.user_setup event instead!
+*
+* @event core.common
+* @since 3.1-A1
+*/
 $phpbb_dispatcher->dispatch('core.common');
-- 
cgit v1.2.1


From 10f8c738b60d3acd42e002c334eee8f8d8dd74d5 Mon Sep 17 00:00:00 2001
From: Patrick Webster <noxwizard@phpbb.com>
Date: Fri, 3 Aug 2012 01:33:51 -0500
Subject: [ticket/11043] Update template hook name

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

(limited to 'phpBB/common.php')

diff --git a/phpBB/common.php b/phpBB/common.php
index 81fe275008..a3e4af88ec 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -132,7 +132,7 @@ $phpbb_subscriber_loader->load();
 
 // Add own hook handler
 require($phpbb_root_path . 'includes/hooks/index.' . $phpEx);
-$phpbb_hook = new phpbb_hook(array('exit_handler', 'phpbb_user_session_handler', 'append_sid', array('template', 'display')));
+$phpbb_hook = new phpbb_hook(array('exit_handler', 'phpbb_user_session_handler', 'append_sid', array('phpbb_template', 'call_hook')));
 
 foreach ($cache->obtain_hooks() as $hook)
 {
-- 
cgit v1.2.1


From 3c71f07a3eddd4fa824c401de2e77ce00e5aec15 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Fri, 3 Aug 2012 12:34:19 +0200
Subject: [ticket/11043] Change hook name back to display, since that's where
 we hook in.

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

(limited to 'phpBB/common.php')

diff --git a/phpBB/common.php b/phpBB/common.php
index a3e4af88ec..5882bbf9fb 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -132,7 +132,7 @@ $phpbb_subscriber_loader->load();
 
 // Add own hook handler
 require($phpbb_root_path . 'includes/hooks/index.' . $phpEx);
-$phpbb_hook = new phpbb_hook(array('exit_handler', 'phpbb_user_session_handler', 'append_sid', array('phpbb_template', 'call_hook')));
+$phpbb_hook = new phpbb_hook(array('exit_handler', 'phpbb_user_session_handler', 'append_sid', array('phpbb_template', 'display')));
 
 foreach ($cache->obtain_hooks() as $hook)
 {
-- 
cgit v1.2.1


From c362434890c075a5c04cfcd40f2809226e33c229 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 8 Aug 2012 13:24:31 +0200
Subject: [feature/php-events] Fix typos in core.common docs block

PHPBB3-9550
---
 phpBB/common.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/common.php')

diff --git a/phpBB/common.php b/phpBB/common.php
index e18c27abd1..cf990dbc3a 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -150,9 +150,9 @@ if (!$config['use_system_cron'])
 * You can use this event to load function files and initiate objects
 *
 * NOTE:	At this point the global session ($user) and permissions ($auth)
-*		do NOT exist yet. If you need to use the user objec
-*		(f.e. to use language files) or need to check permissions, please use
-*		the core.user_setup event instead!
+*		do NOT exist yet. If you need to use the user object
+*		(f.e. to include language files) or need to check permissions,
+*		please use the core.user_setup event instead!
 *
 * @event core.common
 * @since 3.1-A1
-- 
cgit v1.2.1


From 4feb9aa8d7bda303b62acec924008f75042eb757 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Sat, 25 Aug 2012 16:43:41 +0200
Subject: [feature/dic] Coding style: Braces

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

(limited to 'phpBB/common.php')

diff --git a/phpBB/common.php b/phpBB/common.php
index f958f06ce0..02dad17cf0 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -102,7 +102,8 @@ $phpbb_class_loader = $phpbb_container->get('class_loader');
 $phpbb_class_loader_ext = $phpbb_container->get('class_loader.ext');
 
 $ids = array_keys($phpbb_container->findTaggedServiceIds('container.processor'));
-foreach ($ids as $id) {
+foreach ($ids as $id)
+{
 	$processor = $phpbb_container->get($id);
 	$processor->process($phpbb_container);
 }
-- 
cgit v1.2.1


From 7ed7b19a1f1c3732b561ec3c8a4a39f115b5e6ac Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Sat, 1 Sep 2012 19:12:57 +0200
Subject: [feature/dic] Remove unneeded newline

PHPBB3-10739
---
 phpBB/common.php | 1 -
 1 file changed, 1 deletion(-)

(limited to 'phpBB/common.php')

diff --git a/phpBB/common.php b/phpBB/common.php
index 6ca495a7e3..281eb88c4d 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -86,7 +86,6 @@ require($phpbb_root_path . 'includes/constants.' . $phpEx);
 require($phpbb_root_path . 'includes/db/' . ltrim($dbms, 'dbal_') . '.' . $phpEx);
 require($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx);
 
-
 // Set PHP error handler to ours
 set_error_handler(defined('PHPBB_MSG_HANDLER') ? PHPBB_MSG_HANDLER : 'msg_handler');
 
-- 
cgit v1.2.1


From d543f0ffb1334d0a22c30077a9ed27c098dc4af5 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Sat, 8 Sep 2012 14:41:41 +0200
Subject: [ticket/11101] Delay execution of container processors

Also fix the name of the ext processor service.

PHPBB3-11101
---
 phpBB/common.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'phpBB/common.php')

diff --git a/phpBB/common.php b/phpBB/common.php
index 281eb88c4d..c6bb5c6cfe 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -100,13 +100,6 @@ $processor->process($phpbb_container);
 $phpbb_class_loader = $phpbb_container->get('class_loader');
 $phpbb_class_loader_ext = $phpbb_container->get('class_loader.ext');
 
-$ids = array_keys($phpbb_container->findTaggedServiceIds('container.processor'));
-foreach ($ids as $id)
-{
-	$processor = $phpbb_container->get($id);
-	$processor->process($phpbb_container);
-}
-
 // set up caching
 $cache = $phpbb_container->get('cache');
 
@@ -132,6 +125,13 @@ $phpbb_subscriber_loader = $phpbb_container->get('event.subscriber_loader');
 $template = $phpbb_container->get('template');
 $phpbb_style = $phpbb_container->get('style');
 
+$ids = array_keys($phpbb_container->findTaggedServiceIds('container.processor'));
+foreach ($ids as $id)
+{
+	$processor = $phpbb_container->get($id);
+	$processor->process($phpbb_container);
+}
+
 // Add own hook handler
 require($phpbb_root_path . 'includes/hooks/index.' . $phpEx);
 $phpbb_hook = new phpbb_hook(array('exit_handler', 'phpbb_user_session_handler', 'append_sid', array('phpbb_template', 'display')));
-- 
cgit v1.2.1


From c630480ca1a426cb0897be35626baac2694fccf5 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Wed, 17 Oct 2012 15:03:06 -0400
Subject: [ticket/10848] Redirect from adm to installer correctly.

PHPBB3-10848
---
 phpBB/common.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'phpBB/common.php')

diff --git a/phpBB/common.php b/phpBB/common.php
index 491addc5e0..bdb33707cc 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -38,10 +38,14 @@ if (!defined('PHPBB_INSTALLED'))
 		$script_name = (!empty($_SERVER['REQUEST_URI'])) ? $_SERVER['REQUEST_URI'] : getenv('REQUEST_URI');
 	}
 
+	// $phpbb_root_path accounts for redirects from e.g. /adm
+	$script_path = trim(dirname($script_name)) . '/' . $phpbb_root_path . 'install/index.' . $phpEx;
 	// Replace any number of consecutive backslashes and/or slashes with a single slash
 	// (could happen on some proxy setups and/or Windows servers)
-	$script_path = trim(dirname($script_name)) . '/install/index.' . $phpEx;
 	$script_path = preg_replace('#[\\\\/]{2,}#', '/', $script_path);
+	// Eliminate . and .. from the path
+	require($phpbb_root_path . 'includes/functions.' . $phpEx);
+	$script_path = clean_path($script_path);
 
 	$url = (($secure) ? 'https://' : 'http://') . $server_name;
 
-- 
cgit v1.2.1


From bb09cd9c8e76ac3af848d09db8ea1928dab66158 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Wed, 17 Oct 2012 15:13:35 -0400
Subject: [ticket/10848] Add phpbb_ prefix.

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

(limited to 'phpBB/common.php')

diff --git a/phpBB/common.php b/phpBB/common.php
index bdb33707cc..5849d48453 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -45,7 +45,7 @@ if (!defined('PHPBB_INSTALLED'))
 	$script_path = preg_replace('#[\\\\/]{2,}#', '/', $script_path);
 	// Eliminate . and .. from the path
 	require($phpbb_root_path . 'includes/functions.' . $phpEx);
-	$script_path = clean_path($script_path);
+	$script_path = phpbb_clean_path($script_path);
 
 	$url = (($secure) ? 'https://' : 'http://') . $server_name;
 
-- 
cgit v1.2.1


From b283df8241c3d8fc5f2684e37d8a0f237df39c4f Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Wed, 17 Oct 2012 22:35:36 -0400
Subject: [ticket/10848] Move include up.

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

(limited to 'phpBB/common.php')

diff --git a/phpBB/common.php b/phpBB/common.php
index 5849d48453..31ca746924 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -26,6 +26,8 @@ if (file_exists($phpbb_root_path . 'config.' . $phpEx))
 if (!defined('PHPBB_INSTALLED'))
 {
 	// Redirect the user to the installer
+	require($phpbb_root_path . 'includes/functions.' . $phpEx);
+
 	// We have to generate a full HTTP/1.1 header here since we can't guarantee to have any of the information
 	// available as used by the redirect function
 	$server_name = (!empty($_SERVER['HTTP_HOST'])) ? strtolower($_SERVER['HTTP_HOST']) : ((!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : getenv('SERVER_NAME'));
@@ -44,7 +46,6 @@ if (!defined('PHPBB_INSTALLED'))
 	// (could happen on some proxy setups and/or Windows servers)
 	$script_path = preg_replace('#[\\\\/]{2,}#', '/', $script_path);
 	// Eliminate . and .. from the path
-	require($phpbb_root_path . 'includes/functions.' . $phpEx);
 	$script_path = phpbb_clean_path($script_path);
 
 	$url = (($secure) ? 'https://' : 'http://') . $server_name;
-- 
cgit v1.2.1